diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-12-28 21:04:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-31 11:53:26 +0000 |
commit | 1027f7a3c3632321f542140b5f13e9f51879b0c4 (patch) | |
tree | db0375a9bde297b0db0357ee30d8a0287c29c0c2 /meta/recipes-devtools | |
parent | d880402d75832edc95dba16a310a40864ac3f20f (diff) | |
download | poky-1027f7a3c3632321f542140b5f13e9f51879b0c4.tar.gz |
cmake: update 3.18.4 -> 3.19.2
License-Update: only the first two lines contain licensing info
(From OE-Core rev: 72f86e4e986b70600a746eb219315b81b0367be3)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_3.19.2.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.18.4.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch | 22 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.19.2.bb (renamed from meta/recipes-devtools/cmake/cmake_3.18.4.bb) | 0 |
6 files changed, 43 insertions, 16 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.18.4.bb b/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb index d91e42ef9a..d91e42ef9a 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.18.4.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb | |||
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index e840e884cf..db03819b66 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
@@ -11,7 +11,7 @@ BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" | |||
11 | SECTION = "console/utils" | 11 | SECTION = "console/utils" |
12 | LICENSE = "BSD-3-Clause" | 12 | LICENSE = "BSD-3-Clause" |
13 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=c721f56fce89ba2eadc2fdd8ba1f4d83 \ | 13 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=c721f56fce89ba2eadc2fdd8ba1f4d83 \ |
14 | file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14 \ | 14 | file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ |
15 | " | 15 | " |
16 | 16 | ||
17 | CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | 17 | CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
@@ -20,9 +20,10 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ | |||
20 | file://0002-cmake-Prevent-the-detection-of-Qt5.patch \ | 20 | file://0002-cmake-Prevent-the-detection-of-Qt5.patch \ |
21 | file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ | 21 | file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ |
22 | file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ | 22 | file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ |
23 | file://0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch \ | ||
23 | " | 24 | " |
24 | 25 | ||
25 | SRC_URI[sha256sum] = "597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77" | 26 | SRC_URI[sha256sum] = "e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0" |
26 | 27 | ||
27 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" | 28 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" |
28 | 29 | ||
diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch index c4f81b27b5..8181510324 100644 --- a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch +++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dd0fe8d54def4684d360b3e9b10e963ef0208202 Mon Sep 17 00:00:00 2001 | 1 | From 66d5b27dc37ef6243f6549e16d0285ba6c064a6e Mon Sep 17 00:00:00 2001 |
2 | From: Cody P Schafer <dev@codyps.com> | 2 | From: Cody P Schafer <dev@codyps.com> |
3 | Date: Thu, 27 Apr 2017 11:35:05 -0400 | 3 | Date: Thu, 27 Apr 2017 11:35:05 -0400 |
4 | Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default | 4 | Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default |
@@ -25,10 +25,10 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | |||
25 | 1 file changed, 7 insertions(+) | 25 | 1 file changed, 7 insertions(+) |
26 | 26 | ||
27 | diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake | 27 | diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake |
28 | index f3ec4da..bb05656 100644 | 28 | index bae270d..5bb6bc0 100644 |
29 | --- a/Modules/CMakeDetermineSystem.cmake | 29 | --- a/Modules/CMakeDetermineSystem.cmake |
30 | +++ b/Modules/CMakeDetermineSystem.cmake | 30 | +++ b/Modules/CMakeDetermineSystem.cmake |
31 | @@ -81,6 +81,13 @@ else() | 31 | @@ -111,6 +111,13 @@ else() |
32 | endif() | 32 | endif() |
33 | endif() | 33 | endif() |
34 | 34 | ||
diff --git a/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch b/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch new file mode 100644 index 0000000000..4483bbce18 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From ca105727dc4862733c3aad09e9de819be63a7b6b Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Sun, 27 Dec 2020 23:18:10 +0100 | ||
4 | Subject: [PATCH] cm_cxx_features.cmake: do not try to run the test binary | ||
5 | |||
6 | This causes errors when cross compiling cmake. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | Source/Checks/cm_cxx_features.cmake | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake | ||
15 | index 663d89a..e8dca3b 100644 | ||
16 | --- a/Source/Checks/cm_cxx_features.cmake | ||
17 | +++ b/Source/Checks/cm_cxx_features.cmake | ||
18 | @@ -81,7 +81,7 @@ if(CMake_HAVE_CXX_MAKE_UNIQUE) | ||
19 | endif() | ||
20 | cm_check_cxx_feature(unique_ptr) | ||
21 | if (NOT CMAKE_CXX_STANDARD LESS "17") | ||
22 | - cm_check_cxx_feature(filesystem TRY_RUN) | ||
23 | + cm_check_cxx_feature(filesystem) | ||
24 | else() | ||
25 | set(CMake_HAVE_CXX_FILESYSTEM FALSE) | ||
26 | endif() | ||
diff --git a/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch b/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch index 162bfe5783..33db07ccf0 100644 --- a/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch +++ b/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 106cf5134d22db889e4ddf2f98ec302d5f4b9ca7 Mon Sep 17 00:00:00 2001 | 1 | From 98abade8cc119e076e4c5f1461c5188f6d49c1d8 Mon Sep 17 00:00:00 2001 |
2 | From: Otavio Salvador <otavio@ossystems.com.br> | 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
3 | Date: Wed, 17 Jan 2018 10:02:14 -0200 | 3 | Date: Wed, 17 Jan 2018 10:02:14 -0200 |
4 | Subject: [PATCH] cmake: Prevent the detection of Qt5 | 4 | Subject: [PATCH] cmake: Prevent the detection of Qt5 |
@@ -25,23 +25,23 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | |||
25 | 7 files changed, 8 insertions(+), 9 deletions(-) | 25 | 7 files changed, 8 insertions(+), 9 deletions(-) |
26 | 26 | ||
27 | diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt | 27 | diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt |
28 | index 98dd0e2..252302b 100644 | 28 | index 452a303..d0a9fb4 100644 |
29 | --- a/Source/QtDialog/CMakeLists.txt | 29 | --- a/Source/QtDialog/CMakeLists.txt |
30 | +++ b/Source/QtDialog/CMakeLists.txt | 30 | +++ b/Source/QtDialog/CMakeLists.txt |
31 | @@ -3,7 +3,7 @@ | 31 | @@ -3,7 +3,7 @@ |
32 | 32 | ||
33 | project(QtDialog) | 33 | project(QtDialog) |
34 | CMake_OPTIONAL_COMPONENT(cmake-gui) | 34 | CMake_OPTIONAL_COMPONENT(cmake-gui) |
35 | -find_package(Qt5Widgets QUIET) | 35 | -find_package(Qt5Widgets REQUIRED) |
36 | +#find_package(Qt5Widgets QUIET) | 36 | +#find_package(Qt5Widgets REQUIRED) |
37 | if (Qt5Widgets_FOUND) | 37 | |
38 | include_directories(${Qt5Widgets_INCLUDE_DIRS}) | 38 | set(CMake_QT_EXTRA_LIBRARIES) |
39 | add_definitions(${Qt5Widgets_DEFINITONS}) | 39 | |
40 | diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt | 40 | diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt |
41 | index db6dbf3..5b26879 100644 | 41 | index 1fb47cb..e022229 100644 |
42 | --- a/Tests/CMakeLists.txt | 42 | --- a/Tests/CMakeLists.txt |
43 | +++ b/Tests/CMakeLists.txt | 43 | +++ b/Tests/CMakeLists.txt |
44 | @@ -215,7 +215,7 @@ if(BUILD_TESTING) | 44 | @@ -251,7 +251,7 @@ if(BUILD_TESTING) |
45 | set(CMake_TEST_Qt5 1) | 45 | set(CMake_TEST_Qt5 1) |
46 | endif() | 46 | endif() |
47 | if(CMake_TEST_Qt5) | 47 | if(CMake_TEST_Qt5) |
@@ -96,10 +96,10 @@ index c08efc4..87e25d9 100644 | |||
96 | set(CMAKE_CXX_STANDARD 11) | 96 | set(CMAKE_CXX_STANDARD 11) |
97 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) | 97 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) |
98 | diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt | 98 | diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt |
99 | index 10e66c3..ecc4eeb 100644 | 99 | index 370dd76..6bacbff 100644 |
100 | --- a/Tests/RunCMake/CMakeLists.txt | 100 | --- a/Tests/RunCMake/CMakeLists.txt |
101 | +++ b/Tests/RunCMake/CMakeLists.txt | 101 | +++ b/Tests/RunCMake/CMakeLists.txt |
102 | @@ -440,7 +440,7 @@ if(NOT WIN32) | 102 | @@ -473,7 +473,7 @@ if(NOT WIN32) |
103 | endif () | 103 | endif () |
104 | 104 | ||
105 | find_package(Qt4 QUIET) | 105 | find_package(Qt4 QUIET) |
diff --git a/meta/recipes-devtools/cmake/cmake_3.18.4.bb b/meta/recipes-devtools/cmake/cmake_3.19.2.bb index 64c92b89f2..64c92b89f2 100644 --- a/meta/recipes-devtools/cmake/cmake_3.18.4.bb +++ b/meta/recipes-devtools/cmake/cmake_3.19.2.bb | |||