summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorMoritz Haase <Moritz.Haase@bmw.de>2025-07-03 15:27:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-07-17 10:41:18 +0100
commit2c9a6b4a81b642fc3e6815aa83d1c9bafb56c7db (patch)
treeb27f6a7ccc0e788b4fb8482d65b8e17febbdd7be /meta/lib/oeqa
parent3bb9a31522ae7435f87f139881d4947c229b072a (diff)
downloadpoky-2c9a6b4a81b642fc3e6815aa83d1c9bafb56c7db.tar.gz
cmake: upgrade 3.31.6 -> 4.0.3
This is the first major release bump for CMake since 3.0 was released in 2014. Compatibility with versions of CMake older than 3.5 has been removed. Full release notes are available at [0]. Obsolete patches have been removed and the few remaining ones have been refreshed. We can now build cmake without patches, only cmake-native requires two that are not suitable for upstreaming. The main license file has been renamed from Copyright.txt to LICENSE.rst in [1]. References to the file have been updated, causing changes to the licensing header in 'cmake.h' (see [2]). Additionally, the '1996 - 2024' copyright statement in (cm)curl's COPYING was updated to '1996 - 2025' in [3]. [0]: https://cmake.org/cmake/help/v4.0/release/4.0.html [1]: https://gitlab.kitware.com/cmake/cmake/-/commit/2d42a5444f859891b6598c76ea5d51510013565e [2]: https://gitlab.kitware.com/cmake/cmake/-/commit/de273b2e115974a012a6204ffee046dc9ce77586 [3]: https://gitlab.kitware.com/cmake/cmake/-/commit/48b13baebc7f99442c3b872f202efd2fb92d6d7f License-Update: License file renamed; copyright years updated (From OE-Core rev: fc7aafb30bc5fe83f8d2ed451cb6b4d68b131fb5) Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> CC: alex.kanavin@gmail.com Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/sdkext/files/myapp_cmake/CMakeLists.txt2
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py10
2 files changed, 9 insertions, 3 deletions
diff --git a/meta/lib/oeqa/sdkext/files/myapp_cmake/CMakeLists.txt b/meta/lib/oeqa/sdkext/files/myapp_cmake/CMakeLists.txt
index 19d773dd63..b31f1622e2 100644
--- a/meta/lib/oeqa/sdkext/files/myapp_cmake/CMakeLists.txt
+++ b/meta/lib/oeqa/sdkext/files/myapp_cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
1cmake_minimum_required (VERSION 2.6) 1cmake_minimum_required (VERSION 3.10)
2project (myapp) 2project (myapp)
3# The version number. 3# The version number.
4set (myapp_VERSION_MAJOR 1) 4set (myapp_VERSION_MAJOR 1)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index d5715b328b..580c567be3 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -406,7 +406,7 @@ class DevtoolAddTests(DevtoolBase):
406 test_file_dir_full = os.path.join(test_file_package_root, test_file_dir) 406 test_file_dir_full = os.path.join(test_file_package_root, test_file_dir)
407 bb.utils.mkdirhier(test_file_dir_full) 407 bb.utils.mkdirhier(test_file_dir_full)
408 with open(os.path.join(test_file_dir_full, test_file_name), "w") as f: 408 with open(os.path.join(test_file_dir_full, test_file_name), "w") as f:
409 f.write(test_file_content) 409 f.write(test_file_content)
410 bin_package_path = os.path.join(tempdir, "%s.tar.gz" % pn) 410 bin_package_path = os.path.join(tempdir, "%s.tar.gz" % pn)
411 runCmd("tar czf %s -C %s ." % (bin_package_path, test_file_package_root)) 411 runCmd("tar czf %s -C %s ." % (bin_package_path, test_file_package_root))
412 412
@@ -509,7 +509,13 @@ class DevtoolAddTests(DevtoolBase):
509 # normally cover, which triggers the installed-vs-shipped QA test we have 509 # normally cover, which triggers the installed-vs-shipped QA test we have
510 # within do_package 510 # within do_package
511 recipefile = '%s/recipes/libftdi/libftdi_%s.bb' % (self.workspacedir, version) 511 recipefile = '%s/recipes/libftdi/libftdi_%s.bb' % (self.workspacedir, version)
512 result = runCmd('recipetool setvar %s EXTRA_OECMAKE -- \'-DPYTHON_BINDINGS=OFF -DLIBFTDI_CMAKE_CONFIG_DIR=${datadir}/cmake/Modules\'' % recipefile) 512 # There is no upstream release that supports building with CMake 4+ yet, so we explicitly
513 # set the policy minimum version via EXTRA_OECMAKE. That's easier than applying backported
514 # patches.
515 result = runCmd(
516 "recipetool setvar %s EXTRA_OECMAKE -- '-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DPYTHON_BINDINGS=OFF -DLIBFTDI_CMAKE_CONFIG_DIR=${datadir}/cmake/Modules'"
517 % recipefile
518 )
513 with open(recipefile, 'a') as f: 519 with open(recipefile, 'a') as f:
514 f.write('\nFILES:${PN}-dev += "${datadir}/cmake/Modules"\n') 520 f.write('\nFILES:${PN}-dev += "${datadir}/cmake/Modules"\n')
515 # We don't have the ability to pick up this dependency automatically yet... 521 # We don't have the ability to pick up this dependency automatically yet...