diff options
author | Yogesh Tyagi <yogesh.tyagi@intel.com> | 2025-07-24 14:04:07 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2025-07-25 14:17:17 +0800 |
commit | 5776a3adb889aa32fc5ae92bac6402a0995eb8f1 (patch) | |
tree | 38baec4ebe18f2e1663438a22e8afd808f283819 | |
parent | 585c060c0d3bd379be1160f5a8f2d4e82e472863 (diff) | |
download | meta-intel-5776a3adb889aa32fc5ae92bac6402a0995eb8f1.tar.gz |
lms : set a baseline policy version for cmake
Cmake upgrade to 4.0+ removes compatibility with versions older than 3.5 [1].
Set a baseline policy version for CMake using
CMAKE_POLICY_VERSION_MINIMUM variable until upstream source implements the fix.
[1] https://git.yoctoproject.org/poky/commit/?id=2c9a6b4a81b642fc3e6815aa83d1c9bafb56c7db
Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
2 files changed, 44 insertions, 0 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch new file mode 100644 index 00000000..34622d42 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From e1f6129390706044112496b6f10baee5b604b4c8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
3 | Date: Wed, 23 Jul 2025 23:48:41 +0800 | ||
4 | Subject: [PATCH] cmake: Bump required CMake version to 3.5 to allow builds | ||
5 | with CMake 4+ | ||
6 | |||
7 | This enables builds with CMake 4+, fixing: | ||
8 | |||
9 | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | ||
10 | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | |||
12 | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | to tell CMake that the project requires at least <min> but has been | ||
14 | updated to work with policies introduced by <max> or earlier. | ||
15 | |||
16 | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | |||
18 | Upstream-Status: Inappropriate | ||
19 | |||
20 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
21 | --- | ||
22 | CIM_Framework/openwsman/CMakeLists.txt | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/CIM_Framework/openwsman/CMakeLists.txt b/CIM_Framework/openwsman/CMakeLists.txt | ||
26 | index 6e54c66..e2ffa5f 100644 | ||
27 | --- a/CIM_Framework/openwsman/CMakeLists.txt | ||
28 | +++ b/CIM_Framework/openwsman/CMakeLists.txt | ||
29 | @@ -6,7 +6,7 @@ PROJECT(openwsman) | ||
30 | |||
31 | # 2.6 minimum because of CMP0005 (escaping defines) | ||
32 | # 2.8.12 minimum because CMake 3.19.7 says so | ||
33 | -cmake_minimum_required(VERSION 2.8.12) | ||
34 | +cmake_minimum_required(VERSION 3.5) | ||
35 | |||
36 | include(CTest) | ||
37 | enable_testing() | ||
38 | -- | ||
39 | 2.37.3 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb index 0a5a57ed..ae60df9e 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb | |||
@@ -21,12 +21,17 @@ PACKAGECONFIG[networkmanager] = "-DNETWORK_NM=ON, -DNETWORK_NM=OFF, networkmanag | |||
21 | 21 | ||
22 | REQUIRED_DISTRO_FEATURES = "systemd" | 22 | REQUIRED_DISTRO_FEATURES = "systemd" |
23 | 23 | ||
24 | EXTRA_OECMAKE += " \ | ||
25 | -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ | ||
26 | " | ||
27 | |||
24 | FILES:${PN} += "${datadir}/dbus-1/system-services/*.service" | 28 | FILES:${PN} += "${datadir}/dbus-1/system-services/*.service" |
25 | 29 | ||
26 | SYSTEMD_SERVICE:${PN} = "lms.service" | 30 | SYSTEMD_SERVICE:${PN} = "lms.service" |
27 | 31 | ||
28 | SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \ | 32 | SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \ |
29 | file://0001-LMS-fix-build-issue-with-gcc-15.patch \ | 33 | file://0001-LMS-fix-build-issue-with-gcc-15.patch \ |
34 | file://0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch \ | ||
30 | " | 35 | " |
31 | SRCREV = "388f115b2aeb3ea11499971c65f828daefd32c47" | 36 | SRCREV = "388f115b2aeb3ea11499971c65f828daefd32c47" |
32 | 37 | ||