diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-05 17:17:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-09 23:30:15 +0100 |
commit | 25fdd2816173d48c61cbeb33acbf49cac8c4373d (patch) | |
tree | b0ef6ba333c08b97d0450c8fd43f874ea7142c21 | |
parent | ecaefb9d57bef774fc87a2a13f13459304f435a6 (diff) | |
download | poky-25fdd2816173d48c61cbeb33acbf49cac8c4373d.tar.gz |
cmake: update 3.19.5 -> 3.20.1
Remove 0002-cmake-Prevent-the-detection-of-Qt5.patch
(patch purpose and failing scenarios unclear; disabling
is better done through configuration options which
are available for all of these items).
License-Update: copyright years
(From OE-Core rev: 6f3a4f224931866ab2e9758530efdb81d7ddb63d)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_3.20.1.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.19.5.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 | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch | 122 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.20.1.bb (renamed from meta/recipes-devtools/cmake/cmake_3.19.5.bb) | 0 |
5 files changed, 3 insertions, 126 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.19.5.bb b/meta/recipes-devtools/cmake/cmake-native_3.20.1.bb index d91e42ef9a..d91e42ef9a 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.19.5.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.20.1.bb | |||
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index e0f59a6c67..2e6059f980 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
@@ -10,19 +10,18 @@ HOMEPAGE = "http://www.cmake.org/" | |||
10 | BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" | 10 | 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=31023e1d3f51ca90a58f55bcee8e2339 \ |
14 | file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ | 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])}" |
18 | 18 | ||
19 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ | 19 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ |
20 | file://0002-cmake-Prevent-the-detection-of-Qt5.patch \ | ||
21 | file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ | 20 | file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ |
22 | file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ | 21 | file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ |
23 | " | 22 | " |
24 | 23 | ||
25 | SRC_URI[sha256sum] = "c432296eb5dec6d71eae15d140f6297d63df44e9ffe3e453628d1dc8fc4201ce" | 24 | SRC_URI[sha256sum] = "3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0" |
26 | 25 | ||
27 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" | 26 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" |
28 | 27 | ||
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 8181510324..06e10bf861 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 66d5b27dc37ef6243f6549e16d0285ba6c064a6e Mon Sep 17 00:00:00 2001 | 1 | From ac9b8d316ff3e013bc9d3c063db99aa1f064ce6a 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 |
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 deleted file mode 100644 index 33db07ccf0..0000000000 --- a/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch +++ /dev/null | |||
@@ -1,122 +0,0 @@ | |||
1 | From 98abade8cc119e076e4c5f1461c5188f6d49c1d8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Wed, 17 Jan 2018 10:02:14 -0200 | ||
4 | Subject: [PATCH] cmake: Prevent the detection of Qt5 | ||
5 | |||
6 | Organization: O.S. Systems Software LTDA. | ||
7 | |||
8 | CMake doesn't have dependency on qt4/qt5, so these tests usually fail | ||
9 | but still can cause undeterministic results or build failures (when | ||
10 | OE_QMAKE_PATH_EXTERNAL_HOST_BINS is undefined or native qmake removed | ||
11 | while running the test in cmake) | ||
12 | |||
13 | Upstream-Status: Inappropriate [configuration] | ||
14 | |||
15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
16 | |||
17 | --- | ||
18 | Source/QtDialog/CMakeLists.txt | 2 +- | ||
19 | Tests/CMakeLists.txt | 2 +- | ||
20 | Tests/Qt4And5Automoc/CMakeLists.txt | 4 ++-- | ||
21 | Tests/QtAutogen/AutogenGuiTest.cmake | 3 +-- | ||
22 | Tests/QtAutogen/MacOsFW/CMakeLists.txt | 2 +- | ||
23 | Tests/RunCMake/CMakeLists.txt | 2 +- | ||
24 | Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +- | ||
25 | 7 files changed, 8 insertions(+), 9 deletions(-) | ||
26 | |||
27 | diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt | ||
28 | index 452a303..d0a9fb4 100644 | ||
29 | --- a/Source/QtDialog/CMakeLists.txt | ||
30 | +++ b/Source/QtDialog/CMakeLists.txt | ||
31 | @@ -3,7 +3,7 @@ | ||
32 | |||
33 | project(QtDialog) | ||
34 | CMake_OPTIONAL_COMPONENT(cmake-gui) | ||
35 | -find_package(Qt5Widgets REQUIRED) | ||
36 | +#find_package(Qt5Widgets REQUIRED) | ||
37 | |||
38 | set(CMake_QT_EXTRA_LIBRARIES) | ||
39 | |||
40 | diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt | ||
41 | index 1fb47cb..e022229 100644 | ||
42 | --- a/Tests/CMakeLists.txt | ||
43 | +++ b/Tests/CMakeLists.txt | ||
44 | @@ -251,7 +251,7 @@ if(BUILD_TESTING) | ||
45 | set(CMake_TEST_Qt5 1) | ||
46 | endif() | ||
47 | if(CMake_TEST_Qt5) | ||
48 | - find_package(Qt5Widgets QUIET NO_MODULE) | ||
49 | + #find_package(Qt5Widgets QUIET NO_MODULE) | ||
50 | endif() | ||
51 | |||
52 | if(NOT CMake_TEST_EXTERNAL_CMAKE) | ||
53 | diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt | ||
54 | index ad74961..a9dd74b 100644 | ||
55 | --- a/Tests/Qt4And5Automoc/CMakeLists.txt | ||
56 | +++ b/Tests/Qt4And5Automoc/CMakeLists.txt | ||
57 | @@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12) | ||
58 | project(Qt4And5Automoc) | ||
59 | |||
60 | if (QT_REVERSE_FIND_ORDER) | ||
61 | - find_package(Qt5Core REQUIRED) | ||
62 | + #find_package(Qt5Core REQUIRED) | ||
63 | find_package(Qt4 REQUIRED) | ||
64 | else() | ||
65 | find_package(Qt4 REQUIRED) | ||
66 | - find_package(Qt5Core REQUIRED) | ||
67 | + #find_package(Qt5Core REQUIRED) | ||
68 | endif() | ||
69 | |||
70 | set(CMAKE_AUTOMOC ON) | ||
71 | diff --git a/Tests/QtAutogen/AutogenGuiTest.cmake b/Tests/QtAutogen/AutogenGuiTest.cmake | ||
72 | index b76d341..a6e0acb 100644 | ||
73 | --- a/Tests/QtAutogen/AutogenGuiTest.cmake | ||
74 | +++ b/Tests/QtAutogen/AutogenGuiTest.cmake | ||
75 | @@ -22,8 +22,7 @@ if (QT_TEST_VERSION EQUAL 4) | ||
76 | endmacro() | ||
77 | |||
78 | elseif(QT_TEST_VERSION EQUAL 5) | ||
79 | - | ||
80 | - find_package(Qt5Widgets REQUIRED) | ||
81 | + #find_package(Qt5Widgets REQUIRED) | ||
82 | |||
83 | set(QT_QTCORE_TARGET Qt5::Core) | ||
84 | set(QT_LIBRARIES Qt5::Widgets) | ||
85 | diff --git a/Tests/QtAutogen/MacOsFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt | ||
86 | index c08efc4..87e25d9 100644 | ||
87 | --- a/Tests/QtAutogen/MacOsFW/CMakeLists.txt | ||
88 | +++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt | ||
89 | @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) | ||
90 | project(MacOsFW) | ||
91 | include("../AutogenGuiTest.cmake") | ||
92 | |||
93 | -find_package(Qt5Test REQUIRED) | ||
94 | +#find_package(Qt5Test REQUIRED) | ||
95 | |||
96 | set(CMAKE_CXX_STANDARD 11) | ||
97 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) | ||
98 | diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt | ||
99 | index 370dd76..6bacbff 100644 | ||
100 | --- a/Tests/RunCMake/CMakeLists.txt | ||
101 | +++ b/Tests/RunCMake/CMakeLists.txt | ||
102 | @@ -473,7 +473,7 @@ if(NOT WIN32) | ||
103 | endif () | ||
104 | |||
105 | find_package(Qt4 QUIET) | ||
106 | -find_package(Qt5Core QUIET) | ||
107 | +#find_package(Qt5Core QUIET) | ||
108 | if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0) | ||
109 | add_RunCMake_test(IncompatibleQt) | ||
110 | endif() | ||
111 | diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | ||
112 | index 4fccdc4..b76e1e5 100644 | ||
113 | --- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | ||
114 | +++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | ||
115 | @@ -1,6 +1,6 @@ | ||
116 | |||
117 | find_package(Qt4 REQUIRED) | ||
118 | -find_package(Qt5Core REQUIRED) | ||
119 | +#find_package(Qt5Core REQUIRED) | ||
120 | |||
121 | add_executable(mainexe main.cpp) | ||
122 | target_link_libraries(mainexe Qt4::QtCore Qt5::Core) | ||
diff --git a/meta/recipes-devtools/cmake/cmake_3.19.5.bb b/meta/recipes-devtools/cmake/cmake_3.20.1.bb index 64c92b89f2..64c92b89f2 100644 --- a/meta/recipes-devtools/cmake/cmake_3.19.5.bb +++ b/meta/recipes-devtools/cmake/cmake_3.20.1.bb | |||