summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2019-08-08 09:00:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-12 16:23:57 +0100
commita3845f921a5e7ee46502ee30c2cb8608d5e792e8 (patch)
tree796f964f972dc417536b8f73e047dc3183cfeb79 /meta
parent93f44ffc86f441b58262c8828962c900e3ecf97e (diff)
downloadpoky-a3845f921a5e7ee46502ee30c2cb8608d5e792e8.tar.gz
cmake: 3.14.5 -> 3.15.1
The patches were refreshed with devtool. I rebuilt all cmake recipes from poky and meta-oe without issue. (From OE-Core rev: 022d642b0c8f464b451c543db50bb93012bce607) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.15.1.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.14.5.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc4
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch13
-rw-r--r--meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch33
-rw-r--r--meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch11
-rw-r--r--meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch11
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.15.1.bb (renamed from meta/recipes-devtools/cmake/cmake_3.14.5.bb)0
7 files changed, 31 insertions, 41 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.14.5.bb b/meta/recipes-devtools/cmake/cmake-native_3.15.1.bb
index b2952ee5f5..b2952ee5f5 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.14.5.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.15.1.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index da3aadcc0a..d818a0116f 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -18,7 +18,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
18 file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ 18 file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
19" 19"
20 20
21SRC_URI[md5sum] = "a8cbfc3510b95ea686b4059d8b1f765c" 21SRC_URI[md5sum] = "fc6ffc06e6c356e8ab55fd353d7c260b"
22SRC_URI[sha256sum] = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06" 22SRC_URI[sha256sum] = "18dec548d8f8b04d53c60f9cedcebaa6762f8425339d1e2c889c383d3ccdd7f7"
23 23
24UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 24UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
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 cdeea647fe..3720833d3e 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,9 +1,8 @@
1From 71085723f8028b3e1c4029fc1abe1243ac49ffc6 Mon Sep 17 00:00:00 2001 1From 1e67c3fe52c6c51c00cf1ebb0bfc30c7a5ef9fdb Mon Sep 17 00:00:00 2001
2From: Cody P Schafer <dev@codyps.com> 2From: Cody P Schafer <dev@codyps.com>
3Date: Thu, 27 Apr 2017 11:35:05 -0400 3Date: Thu, 27 Apr 2017 11:35:05 -0400
4Subject: [PATCH 1/5] CMakeDetermineSystem: use oe environment vars to load 4Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default
5 default toolchain file in sdk 5 toolchain file in sdk
6Organization: O.S. Systems Software LTDA.
7 6
8Passing the toolchain by: 7Passing the toolchain by:
9 8
@@ -20,12 +19,13 @@ because '-D' options are cache entries themselves.
20Upstream-Status: Inappropriate [oe-core specific] 19Upstream-Status: Inappropriate [oe-core specific]
21Signed-off-by: Cody P Schafer <dev@codyps.com> 20Signed-off-by: Cody P Schafer <dev@codyps.com>
22Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 21Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
22
23--- 23---
24 Modules/CMakeDetermineSystem.cmake | 7 +++++++ 24 Modules/CMakeDetermineSystem.cmake | 7 +++++++
25 1 file changed, 7 insertions(+) 25 1 file changed, 7 insertions(+)
26 26
27diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake 27diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
28index 600d5580e..32d7f1945 100644 28index dc208c6..e0af4ca 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@@ -81,6 +81,13 @@ else()
@@ -42,6 +42,3 @@ index 600d5580e..32d7f1945 100644
42 # if a toolchain file is used, the user wants to cross compile. 42 # if a toolchain file is used, the user wants to cross compile.
43 # in this case read the toolchain file and keep the CMAKE_HOST_SYSTEM_* 43 # in this case read the toolchain file and keep the CMAKE_HOST_SYSTEM_*
44 # variables around so they can be used in CMakeLists.txt. 44 # variables around so they can be used in CMakeLists.txt.
45--
462.18.0
47
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 8d2dc10ce5..db229e63e2 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,7 +1,8 @@
1From b4b6e9b1be33213ede3f612e87840c0045824d9e Mon Sep 17 00:00:00 2001 1From 5cb6c86696f842274043e7d406f84b3ead1c36e0 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Wed, 17 Jan 2018 10:02:14 -0200 3Date: Wed, 17 Jan 2018 10:02:14 -0200
4Subject: [PATCH 2/5] cmake: Prevent the detection of Qt5 4Subject: [PATCH] cmake: Prevent the detection of Qt5
5
5Organization: O.S. Systems Software LTDA. 6Organization: O.S. Systems Software LTDA.
6 7
7CMake doesn't have dependency on qt4/qt5, so these tests usually fail 8CMake doesn't have dependency on qt4/qt5, so these tests usually fail
@@ -12,6 +13,7 @@ while running the test in cmake)
12Upstream-Status: Inappropriate [configuration] 13Upstream-Status: Inappropriate [configuration]
13 14
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16
15--- 17---
16 Source/QtDialog/CMakeLists.txt | 2 +- 18 Source/QtDialog/CMakeLists.txt | 2 +-
17 Tests/CMakeLists.txt | 2 +- 19 Tests/CMakeLists.txt | 2 +-
@@ -23,12 +25,12 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
23 7 files changed, 8 insertions(+), 9 deletions(-) 25 7 files changed, 8 insertions(+), 9 deletions(-)
24 26
25diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt 27diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
26index 9ce0323844..06c86d63eb 100644 28index cb89d19..9e68981 100644
27--- a/Source/QtDialog/CMakeLists.txt 29--- a/Source/QtDialog/CMakeLists.txt
28+++ b/Source/QtDialog/CMakeLists.txt 30+++ b/Source/QtDialog/CMakeLists.txt
29@@ -6,7 +6,7 @@ if(POLICY CMP0020) 31@@ -3,7 +3,7 @@
30 cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required 32
31 endif() 33 project(QtDialog)
32 CMake_OPTIONAL_COMPONENT(cmake-gui) 34 CMake_OPTIONAL_COMPONENT(cmake-gui)
33-find_package(Qt5Widgets QUIET) 35-find_package(Qt5Widgets QUIET)
34+#find_package(Qt5Widgets QUIET) 36+#find_package(Qt5Widgets QUIET)
@@ -36,10 +38,10 @@ index 9ce0323844..06c86d63eb 100644
36 include_directories(${Qt5Widgets_INCLUDE_DIRS}) 38 include_directories(${Qt5Widgets_INCLUDE_DIRS})
37 add_definitions(${Qt5Widgets_DEFINITONS}) 39 add_definitions(${Qt5Widgets_DEFINITONS})
38diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt 40diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
39index ed98d974b0..7adfbc301b 100644 41index e73b277..91b8b67 100644
40--- a/Tests/CMakeLists.txt 42--- a/Tests/CMakeLists.txt
41+++ b/Tests/CMakeLists.txt 43+++ b/Tests/CMakeLists.txt
42@@ -1342,7 +1342,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release 44@@ -1348,7 +1348,7 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH
43 set(CMake_TEST_Qt5 1) 45 set(CMake_TEST_Qt5 1)
44 endif() 46 endif()
45 if(CMake_TEST_Qt5) 47 if(CMake_TEST_Qt5)
@@ -49,7 +51,7 @@ index ed98d974b0..7adfbc301b 100644
49 if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND) 51 if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND)
50 add_subdirectory(Qt5Autogen) 52 add_subdirectory(Qt5Autogen)
51diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt 53diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt
52index ad74961d9f..a9dd74b151 100644 54index ad74961..a9dd74b 100644
53--- a/Tests/Qt4And5Automoc/CMakeLists.txt 55--- a/Tests/Qt4And5Automoc/CMakeLists.txt
54+++ b/Tests/Qt4And5Automoc/CMakeLists.txt 56+++ b/Tests/Qt4And5Automoc/CMakeLists.txt
55@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12) 57@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12)
@@ -67,7 +69,7 @@ index ad74961d9f..a9dd74b151 100644
67 69
68 set(CMAKE_AUTOMOC ON) 70 set(CMAKE_AUTOMOC ON)
69diff --git a/Tests/QtAutogen/AutogenGuiTest.cmake b/Tests/QtAutogen/AutogenGuiTest.cmake 71diff --git a/Tests/QtAutogen/AutogenGuiTest.cmake b/Tests/QtAutogen/AutogenGuiTest.cmake
70index b76d341a45..a6e0acbafa 100644 72index b76d341..a6e0acb 100644
71--- a/Tests/QtAutogen/AutogenGuiTest.cmake 73--- a/Tests/QtAutogen/AutogenGuiTest.cmake
72+++ b/Tests/QtAutogen/AutogenGuiTest.cmake 74+++ b/Tests/QtAutogen/AutogenGuiTest.cmake
73@@ -22,8 +22,7 @@ if (QT_TEST_VERSION EQUAL 4) 75@@ -22,8 +22,7 @@ if (QT_TEST_VERSION EQUAL 4)
@@ -81,7 +83,7 @@ index b76d341a45..a6e0acbafa 100644
81 set(QT_QTCORE_TARGET Qt5::Core) 83 set(QT_QTCORE_TARGET Qt5::Core)
82 set(QT_LIBRARIES Qt5::Widgets) 84 set(QT_LIBRARIES Qt5::Widgets)
83diff --git a/Tests/QtAutogen/MacOsFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt 85diff --git a/Tests/QtAutogen/MacOsFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt
84index c08efc47a2..87e25d9391 100644 86index c08efc4..87e25d9 100644
85--- a/Tests/QtAutogen/MacOsFW/CMakeLists.txt 87--- a/Tests/QtAutogen/MacOsFW/CMakeLists.txt
86+++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt 88+++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt
87@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) 89@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
@@ -94,10 +96,10 @@ index c08efc47a2..87e25d9391 100644
94 set(CMAKE_CXX_STANDARD 11) 96 set(CMAKE_CXX_STANDARD 11)
95 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) 97 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin)
96diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt 98diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
97index 1f3e5c3006..8ed8d6ac54 100644 99index 69f8162..f389523 100644
98--- a/Tests/RunCMake/CMakeLists.txt 100--- a/Tests/RunCMake/CMakeLists.txt
99+++ b/Tests/RunCMake/CMakeLists.txt 101+++ b/Tests/RunCMake/CMakeLists.txt
100@@ -326,7 +326,7 @@ add_RunCMake_test(configure_file) 102@@ -334,7 +334,7 @@ add_RunCMake_test(configure_file)
101 add_RunCMake_test(CTestTimeoutAfterMatch) 103 add_RunCMake_test(CTestTimeoutAfterMatch)
102 104
103 find_package(Qt4 QUIET) 105 find_package(Qt4 QUIET)
@@ -107,7 +109,7 @@ index 1f3e5c3006..8ed8d6ac54 100644
107 add_RunCMake_test(IncompatibleQt) 109 add_RunCMake_test(IncompatibleQt)
108 endif() 110 endif()
109diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake 111diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
110index 4fccdc418f..b76e1e5313 100644 112index 4fccdc4..b76e1e5 100644
111--- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake 113--- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
112+++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake 114+++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
113@@ -1,6 +1,6 @@ 115@@ -1,6 +1,6 @@
@@ -118,6 +120,3 @@ index 4fccdc418f..b76e1e5313 100644
118 120
119 add_executable(mainexe main.cpp) 121 add_executable(mainexe main.cpp)
120 target_link_libraries(mainexe Qt4::QtCore Qt5::Core) 122 target_link_libraries(mainexe Qt4::QtCore Qt5::Core)
121--
1222.11.0
123
diff --git a/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch b/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch
index 4f2e84337e..d7d87a5256 100644
--- a/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch
+++ b/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch
@@ -1,8 +1,7 @@
1From c783ceeef485c23e13c3d9f0418719cb0e0b86ee Mon Sep 17 00:00:00 2001 1From b003857d3481105c473e2e75bad4e9e2c6e70004 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 12 May 2011 15:36:03 +0000 3Date: Thu, 12 May 2011 15:36:03 +0000
4Subject: [PATCH 3/5] cmake: support OpenEmbedded Qt4 tool binary names 4Subject: [PATCH] cmake: support OpenEmbedded Qt4 tool binary names
5Organization: O.S. Systems Software LTDA.
6 5
7The FindQt4 module looks for Qt4 binaries to be able to gather the 6The FindQt4 module looks for Qt4 binaries to be able to gather the
8paths used for compilation and also to be using during other processes 7paths used for compilation and also to be using during other processes
@@ -20,12 +19,13 @@ Instead of find_program, _find_qt4_program is now used.
20 19
21Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> 20Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de>
22Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 21Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
22
23--- 23---
24 Modules/FindQt4.cmake | 10 +++++----- 24 Modules/FindQt4.cmake | 10 +++++-----
25 1 file changed, 5 insertions(+), 5 deletions(-) 25 1 file changed, 5 insertions(+), 5 deletions(-)
26 26
27diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake 27diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
28index 847a798af..7ad981879 100644 28index a145b46..7e18243 100644
29--- a/Modules/FindQt4.cmake 29--- a/Modules/FindQt4.cmake
30+++ b/Modules/FindQt4.cmake 30+++ b/Modules/FindQt4.cmake
31@@ -518,7 +518,7 @@ endfunction() 31@@ -518,7 +518,7 @@ endfunction()
@@ -54,6 +54,3 @@ index 847a798af..7ad981879 100644
54 _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer4 designer) 54 _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer4 designer)
55 _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) 55 _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist)
56 56
57--
582.18.0
59
diff --git a/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch b/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch
index 6c67dcf104..676e2857d7 100644
--- a/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch
+++ b/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch
@@ -1,8 +1,7 @@
1From 9516fc4260f701c6d9db0c341bb36480362e1747 Mon Sep 17 00:00:00 2001 1From d4a78e8739e845c2963666f7ef6a6c7a89827988 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 5 Jul 2018 10:26:48 -0300 3Date: Thu, 5 Jul 2018 10:26:48 -0300
4Subject: [PATCH 4/5] Fail silently if system Qt installation is broken 4Subject: [PATCH] Fail silently if system Qt installation is broken
5Organization: O.S. Systems Software LTDA.
6 5
7Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the 6Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the
8following error if the system Qt installation is broken: 7following error if the system Qt installation is broken:
@@ -23,12 +22,13 @@ within the if(QT_QTCORE_FOUND) statement.
23 22
24Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> 23Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de>
25Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 24Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
25
26--- 26---
27 Modules/FindQt4.cmake | 39 ++++++++++++++++++++------------------- 27 Modules/FindQt4.cmake | 39 ++++++++++++++++++++-------------------
28 1 file changed, 20 insertions(+), 19 deletions(-) 28 1 file changed, 20 insertions(+), 19 deletions(-)
29 29
30diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake 30diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
31index 7ad981879..8b6f43cda 100644 31index 7e18243..497d5c3 100644
32--- a/Modules/FindQt4.cmake 32--- a/Modules/FindQt4.cmake
33+++ b/Modules/FindQt4.cmake 33+++ b/Modules/FindQt4.cmake
34@@ -988,25 +988,26 @@ if (QT_QMAKE_EXECUTABLE AND 34@@ -988,25 +988,26 @@ if (QT_QMAKE_EXECUTABLE AND
@@ -77,6 +77,3 @@ index 7ad981879..8b6f43cda 100644
77 77
78 foreach(QT_MODULE ${QT_MODULES}) 78 foreach(QT_MODULE ${QT_MODULES})
79 _QT4_ADJUST_LIB_VARS(${QT_MODULE}) 79 _QT4_ADJUST_LIB_VARS(${QT_MODULE})
80--
812.18.0
82
diff --git a/meta/recipes-devtools/cmake/cmake_3.14.5.bb b/meta/recipes-devtools/cmake/cmake_3.15.1.bb
index e0457677e8..e0457677e8 100644
--- a/meta/recipes-devtools/cmake/cmake_3.14.5.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.15.1.bb