diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2018-01-17 13:59:33 -0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-19 12:37:13 +0000 |
commit | b96f5db544a0f2e1f36ab7bd7032b9d4d5adaca6 (patch) | |
tree | 11388a43d5b3aa46d75ac0305cf2b6f5d8eabec1 /meta/recipes-devtools | |
parent | b0e9cf7ee4764a345926310b2793aa51c2e1c3d0 (diff) | |
download | poky-b96f5db544a0f2e1f36ab7bd7032b9d4d5adaca6.tar.gz |
cmake: upgrade 3.9.5 -> 3.10.1
The 3.10.1 version has been in Dec 13, 2017, and has a great set of
features and improvements since the last upgrade.
The release notes of 3.10 release is available at:
https://cmake.org/cmake/help/v3.10/release/3.10.html
Patches updates:
- cmake-Prevent-the-detection-of-Qt5.patch: so it replaces the sed
command calls inside the cmake.inc
- 0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch:
merged upstream, so it has been removed.
- support-oe-qt4-tools-names.patch: rebased.
License-checksum-change: added new contributors
(From OE-Core rev: 9e58926f1cea9d5cb18cb923855d1ae98f88a8ac)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.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.10.1.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.9.5.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 38 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch | 40 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch | 215 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | 14 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.10.1.bb (renamed from meta/recipes-devtools/cmake/cmake_3.9.5.bb) | 0 |
6 files changed, 230 insertions, 77 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.9.5.bb b/meta/recipes-devtools/cmake/cmake-native_3.10.1.bb index e55e8b1cf6..e55e8b1cf6 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.9.5.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.10.1.bb | |||
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 8d65ac5690..045cce3fd0 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
@@ -6,45 +6,19 @@ HOMEPAGE = "http://www.cmake.org/" | |||
6 | BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" | 6 | BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" |
7 | SECTION = "console/utils" | 7 | SECTION = "console/utils" |
8 | LICENSE = "BSD" | 8 | LICENSE = "BSD" |
9 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=24600643e5d1d2b8f7478ae5c9074949 \ | 9 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=79b5b78197c74d5c5f9c7ccadeee4e8c \ |
10 | file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14" | 10 | file://Source/cmake.h;md5=4494dee184212fc89c469c3acd555a14;beginline=1;endline=3 \ |
11 | " | ||
11 | 12 | ||
12 | CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | 13 | CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
13 | 14 | ||
14 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ | 15 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ |
15 | file://support-oe-qt4-tools-names.patch \ | 16 | file://support-oe-qt4-tools-names.patch \ |
16 | file://qt4-fail-silent.patch \ | 17 | file://qt4-fail-silent.patch \ |
17 | file://0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch \ | 18 | file://cmake-Prevent-the-detection-of-Qt5.patch \ |
18 | " | 19 | " |
19 | 20 | ||
20 | SRC_URI[md5sum] = "0922130d0e0c142a88e58c6e4fef4d7d" | 21 | SRC_URI[md5sum] = "9a726e5ec69618b172aa4b06d18c3998" |
21 | SRC_URI[sha256sum] = "6220c1683b4e6bb8f38688fa3ffb17a7cf39f36317c2ddfdc3f12f09d086c166" | 22 | SRC_URI[sha256sum] = "7be36ee24b0f5928251b644d29f5ff268330a916944ef4a75e23ba01e7573284" |
22 | 23 | ||
23 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" | 24 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" |
24 | |||
25 | # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable | ||
26 | # and possibly missing qmake binary (qtbase-native can be removed from sysroot | ||
27 | # e.g. in order to upgrade it, even when there is target qtbase) | ||
28 | |||
29 | # Fixes errors like this in cmake(-native).do_configure: | ||
30 | #| -- Performing Test run_pic_test - Success | ||
31 | #| CMake Error at tmp-eglibc/sysroots/qemuarm/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:27 (message): | ||
32 | #| The imported target "Qt5::Core" references the file | ||
33 | #| | ||
34 | #| "/qmake" | ||
35 | #| | ||
36 | #| but this file does not exist. Possible reasons include: | ||
37 | |||
38 | do_configure_prepend() { | ||
39 | sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt | ||
40 | sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt | ||
41 | sed -i 's/^ find_package(Qt5Widgets QUIET NO_MODULE)/# find_package(Qt5Widgets QUIET NO_MODULE)/g' ${S}/Tests/CMakeLists.txt | ||
42 | sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt | ||
43 | sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutoUicInterface/CMakeLists.txt | ||
44 | sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/CMakeLists.txt | ||
45 | sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | ||
46 | sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/mocRerun/CMakeLists.txt | ||
47 | sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/rccDepends/CMakeLists.txt | ||
48 | sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/mocDepends/CMakeLists.txt | ||
49 | sed -i 's/^find_package(Qt5Widgets REQUIRED)/#find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/mocPlugin/CMakeLists.txt | ||
50 | } | ||
diff --git a/meta/recipes-devtools/cmake/cmake/0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch b/meta/recipes-devtools/cmake/cmake/0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch deleted file mode 100644 index 9b820db009..0000000000 --- a/meta/recipes-devtools/cmake/cmake/0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 46d25e782ebd9b6c50771b6f30433c58fae03a51 Mon Sep 17 00:00:00 2001 | ||
2 | From: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com> | ||
3 | Date: Mon, 26 Jun 2017 11:30:07 -0400 | ||
4 | Subject: [PATCH] cmake: Use find_program if find_host_program is not | ||
5 | available | ||
6 | |||
7 | CMake does not define the `find_host_program` command we've been using | ||
8 | in the cross-compiling code path. It was provided by a widely used | ||
9 | Android toolchain file. For compatibility, continue to use | ||
10 | `find_host_program` if available, but otherwise use just `find_program`. | ||
11 | |||
12 | Upstream-Status: Accepted | ||
13 | [https://gitlab.kitware.com/cmake/cmake/merge_requests/1009] | ||
14 | - Will be in 3.10 | ||
15 | |||
16 | Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com> | ||
17 | --- | ||
18 | Modules/FindCUDA.cmake | 6 +++++- | ||
19 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake | ||
22 | index a4dca54..77ca351 100644 | ||
23 | --- a/Modules/FindCUDA.cmake | ||
24 | +++ b/Modules/FindCUDA.cmake | ||
25 | @@ -679,7 +679,11 @@ if(CMAKE_CROSSCOMPILING) | ||
26 | # add known CUDA targetr root path to the set of directories we search for programs, libraries and headers | ||
27 | set( CMAKE_FIND_ROOT_PATH "${CUDA_TOOLKIT_TARGET_DIR};${CMAKE_FIND_ROOT_PATH}") | ||
28 | macro( cuda_find_host_program ) | ||
29 | - find_host_program( ${ARGN} ) | ||
30 | + if (COMMAND find_host_program) | ||
31 | + find_host_program( ${ARGN} ) | ||
32 | + else() | ||
33 | + find_program( ${ARGN} ) | ||
34 | + endif() | ||
35 | endmacro() | ||
36 | else() | ||
37 | # for non-cross-compile, find_host_program == find_program and CUDA_TOOLKIT_TARGET_DIR == CUDA_TOOLKIT_ROOT_DIR | ||
38 | -- | ||
39 | 2.1.4 | ||
40 | |||
diff --git a/meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch b/meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch new file mode 100644 index 0000000000..88b7e94741 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch | |||
@@ -0,0 +1,215 @@ | |||
1 | From 875c11dbf87d1258ad7d3697a40d605d503e5673 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 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | CMake doesn't have dependency on qt4/qt5, so these tests usually fail | ||
8 | but still can cause undeterministic results or build failures (when | ||
9 | OE_QMAKE_PATH_EXTERNAL_HOST_BINS is undefined or native qmake removed | ||
10 | while running the test in cmake) | ||
11 | |||
12 | Upstream-Status: Inappropriate [configuration] | ||
13 | |||
14 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
15 | --- | ||
16 | Source/QtDialog/CMakeLists.txt | 2 +- | ||
17 | Tests/CMakeLists.txt | 2 +- | ||
18 | Tests/Qt4And5Automoc/CMakeLists.txt | 4 ++-- | ||
19 | Tests/QtAutoUicInterface/CMakeLists.txt | 2 +- | ||
20 | Tests/QtAutogen/CMakeLists.txt | 2 +- | ||
21 | Tests/QtAutogen/macosFW/CMakeLists.txt | 2 +- | ||
22 | Tests/QtAutogen/mocDepends/CMakeLists.txt | 2 +- | ||
23 | Tests/QtAutogenRerun/CMakeLists.txt | 4 ++-- | ||
24 | Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt | 2 +- | ||
25 | Tests/QtAutogenRerun/mocRerun/CMakeLists.txt | 2 +- | ||
26 | Tests/QtAutogenRerun/rccDepends/CMakeLists.txt | 2 +- | ||
27 | Tests/RunCMake/CMakeLists.txt | 2 +- | ||
28 | Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +- | ||
29 | 13 files changed, 15 insertions(+), 15 deletions(-) | ||
30 | |||
31 | diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt | ||
32 | index b38797bca..b5fbfc5fa 100644 | ||
33 | --- a/Source/QtDialog/CMakeLists.txt | ||
34 | +++ b/Source/QtDialog/CMakeLists.txt | ||
35 | @@ -6,7 +6,7 @@ if(POLICY CMP0020) | ||
36 | cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required | ||
37 | endif() | ||
38 | CMake_OPTIONAL_COMPONENT(cmake-gui) | ||
39 | -find_package(Qt5Widgets QUIET) | ||
40 | +#find_package(Qt5Widgets QUIET) | ||
41 | if (Qt5Widgets_FOUND) | ||
42 | include_directories(${Qt5Widgets_INCLUDE_DIRS}) | ||
43 | add_definitions(${Qt5Widgets_DEFINITONS}) | ||
44 | diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt | ||
45 | index 533788a44..32ef03c55 100644 | ||
46 | --- a/Tests/CMakeLists.txt | ||
47 | +++ b/Tests/CMakeLists.txt | ||
48 | @@ -1260,7 +1260,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release | ||
49 | set(CMake_TEST_Qt5 1) | ||
50 | endif() | ||
51 | if(CMake_TEST_Qt5) | ||
52 | - find_package(Qt5Widgets QUIET NO_MODULE) | ||
53 | + #find_package(Qt5Widgets QUIET NO_MODULE) | ||
54 | endif() | ||
55 | if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND) | ||
56 | add_test(NAME Qt5Autogen COMMAND ${CMAKE_CTEST_COMMAND} | ||
57 | diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt | ||
58 | index ad74961d9..a9dd74b15 100644 | ||
59 | --- a/Tests/Qt4And5Automoc/CMakeLists.txt | ||
60 | +++ b/Tests/Qt4And5Automoc/CMakeLists.txt | ||
61 | @@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12) | ||
62 | project(Qt4And5Automoc) | ||
63 | |||
64 | if (QT_REVERSE_FIND_ORDER) | ||
65 | - find_package(Qt5Core REQUIRED) | ||
66 | + #find_package(Qt5Core REQUIRED) | ||
67 | find_package(Qt4 REQUIRED) | ||
68 | else() | ||
69 | find_package(Qt4 REQUIRED) | ||
70 | - find_package(Qt5Core REQUIRED) | ||
71 | + #find_package(Qt5Core REQUIRED) | ||
72 | endif() | ||
73 | |||
74 | set(CMAKE_AUTOMOC ON) | ||
75 | diff --git a/Tests/QtAutoUicInterface/CMakeLists.txt b/Tests/QtAutoUicInterface/CMakeLists.txt | ||
76 | index a5c2d99b2..2d640e4a3 100644 | ||
77 | --- a/Tests/QtAutoUicInterface/CMakeLists.txt | ||
78 | +++ b/Tests/QtAutoUicInterface/CMakeLists.txt | ||
79 | @@ -14,7 +14,7 @@ else() | ||
80 | if (NOT QT_TEST_VERSION STREQUAL 5) | ||
81 | message(SEND_ERROR "Invalid Qt version specified.") | ||
82 | endif() | ||
83 | - find_package(Qt5Widgets REQUIRED) | ||
84 | + #find_package(Qt5Widgets REQUIRED) | ||
85 | |||
86 | set(QT_CORE_TARGET Qt5::Core) | ||
87 | set(QT_GUI_TARGET Qt5::Widgets) | ||
88 | diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt | ||
89 | index dff9d0c66..c6e8fc3f5 100644 | ||
90 | --- a/Tests/QtAutogen/CMakeLists.txt | ||
91 | +++ b/Tests/QtAutogen/CMakeLists.txt | ||
92 | @@ -23,7 +23,7 @@ else() | ||
93 | if (NOT QT_TEST_VERSION STREQUAL 5) | ||
94 | message(SEND_ERROR "Invalid Qt version specified.") | ||
95 | endif() | ||
96 | - find_package(Qt5Widgets REQUIRED) | ||
97 | + #find_package(Qt5Widgets REQUIRED) | ||
98 | |||
99 | set(QT_QTCORE_TARGET Qt5::Core) | ||
100 | |||
101 | diff --git a/Tests/QtAutogen/macosFW/CMakeLists.txt b/Tests/QtAutogen/macosFW/CMakeLists.txt | ||
102 | index 114d9bac0..157fe0aaa 100644 | ||
103 | --- a/Tests/QtAutogen/macosFW/CMakeLists.txt | ||
104 | +++ b/Tests/QtAutogen/macosFW/CMakeLists.txt | ||
105 | @@ -1,7 +1,7 @@ | ||
106 | cmake_minimum_required(VERSION 3.8) | ||
107 | project(macos-fw-test) | ||
108 | |||
109 | -find_package(Qt5Test REQUIRED) | ||
110 | +#find_package(Qt5Test REQUIRED) | ||
111 | |||
112 | set(CMAKE_CXX_STANDARD 11) | ||
113 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) | ||
114 | diff --git a/Tests/QtAutogen/mocDepends/CMakeLists.txt b/Tests/QtAutogen/mocDepends/CMakeLists.txt | ||
115 | index 8217b8dbf..86bb7bc7f 100644 | ||
116 | --- a/Tests/QtAutogen/mocDepends/CMakeLists.txt | ||
117 | +++ b/Tests/QtAutogen/mocDepends/CMakeLists.txt | ||
118 | @@ -10,7 +10,7 @@ else() | ||
119 | message(SEND_ERROR "Invalid Qt version specified.") | ||
120 | endif() | ||
121 | |||
122 | - find_package(Qt5Core REQUIRED) | ||
123 | + #find_package(Qt5Core REQUIRED) | ||
124 | set(QT_CORE_TARGET Qt5::Core) | ||
125 | endif() | ||
126 | |||
127 | diff --git a/Tests/QtAutogenRerun/CMakeLists.txt b/Tests/QtAutogenRerun/CMakeLists.txt | ||
128 | index e72c1912e..d7e6884ce 100644 | ||
129 | --- a/Tests/QtAutogenRerun/CMakeLists.txt | ||
130 | +++ b/Tests/QtAutogenRerun/CMakeLists.txt | ||
131 | @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.9) | ||
132 | cmake_policy(SET CMP0071 NEW) | ||
133 | project(QtAutogenRerun) | ||
134 | |||
135 | -# Tell find_package(Qt5) where to find Qt. | ||
136 | +# Tell #find_package(Qt5) where to find Qt. | ||
137 | if(QT_QMAKE_EXECUTABLE) | ||
138 | get_filename_component(Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH) | ||
139 | get_filename_component(Qt_PREFIX_DIR "${Qt_BIN_DIR}" PATH) | ||
140 | @@ -23,7 +23,7 @@ else() | ||
141 | if (NOT QT_TEST_VERSION STREQUAL 5) | ||
142 | message(SEND_ERROR "Invalid Qt version specified.") | ||
143 | endif() | ||
144 | - find_package(Qt5Widgets REQUIRED) | ||
145 | + #find_package(Qt5Widgets REQUIRED) | ||
146 | |||
147 | set(QT_QTCORE_TARGET Qt5::Core) | ||
148 | |||
149 | diff --git a/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt b/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt | ||
150 | index b7cc5e9ff..e1d109953 100644 | ||
151 | --- a/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt | ||
152 | +++ b/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt | ||
153 | @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC_DEPEND_FILTERS | ||
154 | if (NOT QT_TEST_VERSION STREQUAL 5) | ||
155 | message(SEND_ERROR "Invalid Qt version specified.") | ||
156 | endif() | ||
157 | -find_package(Qt5Widgets REQUIRED) | ||
158 | +#find_package(Qt5Widgets REQUIRED) | ||
159 | |||
160 | if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC) | ||
161 | add_definitions(${CMAKE_CXX_COMPILE_OPTIONS_PIC}) | ||
162 | diff --git a/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt b/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt | ||
163 | index bafd9cf48..43ec933d2 100644 | ||
164 | --- a/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt | ||
165 | +++ b/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt | ||
166 | @@ -10,7 +10,7 @@ else() | ||
167 | message(SEND_ERROR "Invalid Qt version specified.") | ||
168 | endif() | ||
169 | |||
170 | - find_package(Qt5Core REQUIRED) | ||
171 | + #find_package(Qt5Core REQUIRED) | ||
172 | set(QT_CORE_TARGET Qt5::Core) | ||
173 | endif() | ||
174 | |||
175 | diff --git a/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt b/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt | ||
176 | index 291592e7d..40cd52868 100644 | ||
177 | --- a/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt | ||
178 | +++ b/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt | ||
179 | @@ -9,7 +9,7 @@ else() | ||
180 | message(SEND_ERROR "Invalid Qt version specified.") | ||
181 | endif() | ||
182 | |||
183 | - find_package(Qt5Core REQUIRED) | ||
184 | + #find_package(Qt5Core REQUIRED) | ||
185 | set(QT_CORE_TARGET Qt5::Core) | ||
186 | endif() | ||
187 | |||
188 | diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt | ||
189 | index 29325ff0a..d30d01e78 100644 | ||
190 | --- a/Tests/RunCMake/CMakeLists.txt | ||
191 | +++ b/Tests/RunCMake/CMakeLists.txt | ||
192 | @@ -274,7 +274,7 @@ add_RunCMake_test(configure_file) | ||
193 | add_RunCMake_test(CTestTimeoutAfterMatch) | ||
194 | |||
195 | find_package(Qt4 QUIET) | ||
196 | -find_package(Qt5Core QUIET) | ||
197 | +#find_package(Qt5Core QUIET) | ||
198 | if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0) | ||
199 | add_RunCMake_test(IncompatibleQt) | ||
200 | endif() | ||
201 | diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | ||
202 | index 4fccdc418..b76e1e531 100644 | ||
203 | --- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | ||
204 | +++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | ||
205 | @@ -1,6 +1,6 @@ | ||
206 | |||
207 | find_package(Qt4 REQUIRED) | ||
208 | -find_package(Qt5Core REQUIRED) | ||
209 | +#find_package(Qt5Core REQUIRED) | ||
210 | |||
211 | add_executable(mainexe main.cpp) | ||
212 | target_link_libraries(mainexe Qt4::QtCore Qt5::Core) | ||
213 | -- | ||
214 | 2.15.1 | ||
215 | |||
diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch index 15cbca89d8..6841554763 100644 --- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch +++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | cmake: support OpenEmbedded Qt4 tool binary names | 1 | From 10b8b523869124d2fc8cd98d9e028c0bcffd61b1 Mon Sep 17 00:00:00 2001 |
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Thu, 12 May 2011 15:36:03 +0000 | ||
4 | Subject: [PATCH 1/2] cmake: support OpenEmbedded Qt4 tool binary names | ||
2 | 5 | ||
3 | The FindQt4 module looks for Qt4 binaries to be able to gather the | 6 | The FindQt4 module looks for Qt4 binaries to be able to gather the |
4 | paths used for compilation and also to be using during other processes | 7 | paths used for compilation and also to be using during other processes |
@@ -15,15 +18,16 @@ The patch was slightly adapted in order to match cmake 3.2.2: | |||
15 | Instead of find_program, _find_qt4_program is now used. | 18 | Instead of find_program, _find_qt4_program is now used. |
16 | 19 | ||
17 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> | 20 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> |
21 | |||
18 | --- | 22 | --- |
19 | Modules/FindQt4.cmake | 10 +++++----- | 23 | Modules/FindQt4.cmake | 10 +++++----- |
20 | 1 file changed, 5 insertions(+), 5 deletions(-) | 24 | 1 file changed, 5 insertions(+), 5 deletions(-) |
21 | 25 | ||
22 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake | 26 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake |
23 | index 11091b5..6704769 100644 | 27 | index c67d0be..0cf169b 100644 |
24 | --- a/Modules/FindQt4.cmake | 28 | --- a/Modules/FindQt4.cmake |
25 | +++ b/Modules/FindQt4.cmake | 29 | +++ b/Modules/FindQt4.cmake |
26 | @@ -522,7 +522,7 @@ endfunction() | 30 | @@ -516,7 +516,7 @@ endfunction() |
27 | 31 | ||
28 | set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) | 32 | set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) |
29 | 33 | ||
@@ -32,7 +36,7 @@ index 11091b5..6704769 100644 | |||
32 | _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) | 36 | _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) |
33 | 37 | ||
34 | if (QT_QMAKE_EXECUTABLE AND | 38 | if (QT_QMAKE_EXECUTABLE AND |
35 | @@ -1148,12 +1148,12 @@ if (QT_QMAKE_EXECUTABLE AND | 39 | @@ -1142,12 +1142,12 @@ if (QT_QMAKE_EXECUTABLE AND |
36 | _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc) | 40 | _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc) |
37 | _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic) | 41 | _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic) |
38 | _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) | 42 | _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) |
@@ -50,5 +54,5 @@ index 11091b5..6704769 100644 | |||
50 | _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) | 54 | _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) |
51 | 55 | ||
52 | -- | 56 | -- |
53 | 1.9.1 | 57 | 2.7.4 |
54 | 58 | ||
diff --git a/meta/recipes-devtools/cmake/cmake_3.9.5.bb b/meta/recipes-devtools/cmake/cmake_3.10.1.bb index 3f8fd7a997..3f8fd7a997 100644 --- a/meta/recipes-devtools/cmake/cmake_3.9.5.bb +++ b/meta/recipes-devtools/cmake/cmake_3.10.1.bb | |||