summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/cmake')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.14.0.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.13.4.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc6
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch2
-rw-r--r--meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch39
-rw-r--r--meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch4
-rw-r--r--meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch2
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.14.0.bb (renamed from meta/recipes-devtools/cmake/cmake_3.13.4.bb)0
7 files changed, 27 insertions, 26 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.13.4.bb b/meta/recipes-devtools/cmake/cmake-native_3.14.0.bb
index fedcf3d4bd..fedcf3d4bd 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.13.4.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.14.0.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 68a71e9139..f787851e2d 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.cmake.org/"
6BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" 6BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"
7SECTION = "console/utils" 7SECTION = "console/utils"
8LICENSE = "BSD" 8LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=f61f5f859bc5ddba2b050eb10335e013 \ 9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=622747147b46f22e1953876a7cba3323 \
10 file://Source/cmake.h;md5=4494dee184212fc89c469c3acd555a14;beginline=1;endline=3 \ 10 file://Source/cmake.h;md5=4494dee184212fc89c469c3acd555a14;beginline=1;endline=3 \
11 " 11 "
12 12
@@ -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] = "b5a544ffc73f6922a6cf371fcb6bae22" 21SRC_URI[md5sum] = "7504e4f3e05b59e083f2127e07059d5d"
22SRC_URI[sha256sum] = "fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b" 22SRC_URI[sha256sum] = "aa76ba67b3c2af1946701f847073f4652af5cbd9f141f221c97af99127e75502"
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 f690720870..cdeea647fe 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
@@ -28,7 +28,7 @@ diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.c
28index 600d5580e..32d7f1945 100644 28index 600d5580e..32d7f1945 100644
29--- a/Modules/CMakeDetermineSystem.cmake 29--- a/Modules/CMakeDetermineSystem.cmake
30+++ b/Modules/CMakeDetermineSystem.cmake 30+++ b/Modules/CMakeDetermineSystem.cmake
31@@ -82,6 +82,13 @@ else() 31@@ -81,6 +81,13 @@ else()
32 endif() 32 endif()
33 endif() 33 endif()
34 34
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 3bea6935b7..8d2dc10ce5 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 @@
1From 7a1f4e724f9c68498f401244c2938e784a2e6fbd Mon Sep 17 00:00:00 2001 1From b4b6e9b1be33213ede3f612e87840c0045824d9e 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 2/5] cmake: Prevent the detection of Qt5
@@ -16,14 +16,14 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16 Source/QtDialog/CMakeLists.txt | 2 +- 16 Source/QtDialog/CMakeLists.txt | 2 +-
17 Tests/CMakeLists.txt | 2 +- 17 Tests/CMakeLists.txt | 2 +-
18 Tests/Qt4And5Automoc/CMakeLists.txt | 4 ++-- 18 Tests/Qt4And5Automoc/CMakeLists.txt | 4 ++--
19 Tests/QtAutogen/AutogenTest.cmake | 2 +- 19 Tests/QtAutogen/AutogenGuiTest.cmake | 3 +--
20 Tests/QtAutogen/MacOsFW/CMakeLists.txt | 2 +- 20 Tests/QtAutogen/MacOsFW/CMakeLists.txt | 2 +-
21 Tests/RunCMake/CMakeLists.txt | 2 +- 21 Tests/RunCMake/CMakeLists.txt | 2 +-
22 Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +- 22 Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +-
23 7 files changed, 8 insertions(+), 8 deletions(-) 23 7 files changed, 8 insertions(+), 9 deletions(-)
24 24
25diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt 25diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
26index 330b74729..e7709dee6 100644 26index 9ce0323844..06c86d63eb 100644
27--- a/Source/QtDialog/CMakeLists.txt 27--- a/Source/QtDialog/CMakeLists.txt
28+++ b/Source/QtDialog/CMakeLists.txt 28+++ b/Source/QtDialog/CMakeLists.txt
29@@ -6,7 +6,7 @@ if(POLICY CMP0020) 29@@ -6,7 +6,7 @@ if(POLICY CMP0020)
@@ -36,10 +36,10 @@ index 330b74729..e7709dee6 100644
36 include_directories(${Qt5Widgets_INCLUDE_DIRS}) 36 include_directories(${Qt5Widgets_INCLUDE_DIRS})
37 add_definitions(${Qt5Widgets_DEFINITONS}) 37 add_definitions(${Qt5Widgets_DEFINITONS})
38diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt 38diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
39index b8b724ed8..63f6bb6d2 100644 39index ed98d974b0..7adfbc301b 100644
40--- a/Tests/CMakeLists.txt 40--- a/Tests/CMakeLists.txt
41+++ b/Tests/CMakeLists.txt 41+++ b/Tests/CMakeLists.txt
42@@ -1297,7 +1297,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release 42@@ -1342,7 +1342,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
43 set(CMake_TEST_Qt5 1) 43 set(CMake_TEST_Qt5 1)
44 endif() 44 endif()
45 if(CMake_TEST_Qt5) 45 if(CMake_TEST_Qt5)
@@ -49,7 +49,7 @@ index b8b724ed8..63f6bb6d2 100644
49 if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND) 49 if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND)
50 add_subdirectory(Qt5Autogen) 50 add_subdirectory(Qt5Autogen)
51diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt 51diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt
52index ad74961d9..a9dd74b15 100644 52index ad74961d9f..a9dd74b151 100644
53--- a/Tests/Qt4And5Automoc/CMakeLists.txt 53--- a/Tests/Qt4And5Automoc/CMakeLists.txt
54+++ b/Tests/Qt4And5Automoc/CMakeLists.txt 54+++ b/Tests/Qt4And5Automoc/CMakeLists.txt
55@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12) 55@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12)
@@ -66,26 +66,27 @@ index ad74961d9..a9dd74b15 100644
66 endif() 66 endif()
67 67
68 set(CMAKE_AUTOMOC ON) 68 set(CMAKE_AUTOMOC ON)
69diff --git a/Tests/QtAutogen/AutogenTest.cmake b/Tests/QtAutogen/AutogenTest.cmake 69diff --git a/Tests/QtAutogen/AutogenGuiTest.cmake b/Tests/QtAutogen/AutogenGuiTest.cmake
70index 8c0a14fca..e9923b21a 100644 70index b76d341a45..a6e0acbafa 100644
71--- a/Tests/QtAutogen/AutogenTest.cmake 71--- a/Tests/QtAutogen/AutogenGuiTest.cmake
72+++ b/Tests/QtAutogen/AutogenTest.cmake 72+++ b/Tests/QtAutogen/AutogenGuiTest.cmake
73@@ -22,7 +22,7 @@ if (QT_TEST_VERSION EQUAL 4) 73@@ -22,8 +22,7 @@ if (QT_TEST_VERSION EQUAL 4)
74 endmacro() 74 endmacro()
75 75
76 elseif(QT_TEST_VERSION EQUAL 5) 76 elseif(QT_TEST_VERSION EQUAL 5)
77-
77- find_package(Qt5Widgets REQUIRED) 78- find_package(Qt5Widgets REQUIRED)
78+ #find_package(Qt5Widgets REQUIRED) 79+ #find_package(Qt5Widgets REQUIRED)
79 80
80 set(QT_QTCORE_TARGET Qt5::Core) 81 set(QT_QTCORE_TARGET Qt5::Core)
81 set(QT_QTGUI_TARGET Qt5::Widgets) 82 set(QT_LIBRARIES Qt5::Widgets)
82diff --git a/Tests/QtAutogen/MacOsFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt 83diff --git a/Tests/QtAutogen/MacOsFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt
83index 26d201926..e48e1c8de 100644 84index c08efc47a2..87e25d9391 100644
84--- a/Tests/QtAutogen/MacOsFW/CMakeLists.txt 85--- a/Tests/QtAutogen/MacOsFW/CMakeLists.txt
85+++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt 86+++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt
86@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) 87@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
87 project(MacOsFW) 88 project(MacOsFW)
88 include("../AutogenTest.cmake") 89 include("../AutogenGuiTest.cmake")
89 90
90-find_package(Qt5Test REQUIRED) 91-find_package(Qt5Test REQUIRED)
91+#find_package(Qt5Test REQUIRED) 92+#find_package(Qt5Test REQUIRED)
@@ -93,10 +94,10 @@ index 26d201926..e48e1c8de 100644
93 set(CMAKE_CXX_STANDARD 11) 94 set(CMAKE_CXX_STANDARD 11)
94 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) 95 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin)
95diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt 96diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
96index 637c5c2cb..c0376effc 100644 97index 1f3e5c3006..8ed8d6ac54 100644
97--- a/Tests/RunCMake/CMakeLists.txt 98--- a/Tests/RunCMake/CMakeLists.txt
98+++ b/Tests/RunCMake/CMakeLists.txt 99+++ b/Tests/RunCMake/CMakeLists.txt
99@@ -310,7 +310,7 @@ add_RunCMake_test(configure_file) 100@@ -326,7 +326,7 @@ add_RunCMake_test(configure_file)
100 add_RunCMake_test(CTestTimeoutAfterMatch) 101 add_RunCMake_test(CTestTimeoutAfterMatch)
101 102
102 find_package(Qt4 QUIET) 103 find_package(Qt4 QUIET)
@@ -106,7 +107,7 @@ index 637c5c2cb..c0376effc 100644
106 add_RunCMake_test(IncompatibleQt) 107 add_RunCMake_test(IncompatibleQt)
107 endif() 108 endif()
108diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake 109diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
109index 4fccdc418..b76e1e531 100644 110index 4fccdc418f..b76e1e5313 100644
110--- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake 111--- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
111+++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake 112+++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
112@@ -1,6 +1,6 @@ 113@@ -1,6 +1,6 @@
@@ -118,5 +119,5 @@ index 4fccdc418..b76e1e531 100644
118 add_executable(mainexe main.cpp) 119 add_executable(mainexe main.cpp)
119 target_link_libraries(mainexe Qt4::QtCore Qt5::Core) 120 target_link_libraries(mainexe Qt4::QtCore Qt5::Core)
120-- 121--
1212.18.0 1222.11.0
122 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 55cf47188a..4f2e84337e 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
@@ -28,7 +28,7 @@ diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
28index 847a798af..7ad981879 100644 28index 847a798af..7ad981879 100644
29--- a/Modules/FindQt4.cmake 29--- a/Modules/FindQt4.cmake
30+++ b/Modules/FindQt4.cmake 30+++ b/Modules/FindQt4.cmake
31@@ -517,7 +517,7 @@ endfunction() 31@@ -518,7 +518,7 @@ endfunction()
32 32
33 set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) 33 set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
34 34
@@ -37,7 +37,7 @@ index 847a798af..7ad981879 100644
37 _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) 37 _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
38 38
39 if (QT_QMAKE_EXECUTABLE AND 39 if (QT_QMAKE_EXECUTABLE AND
40@@ -1135,12 +1135,12 @@ if (QT_QMAKE_EXECUTABLE AND 40@@ -1136,12 +1136,12 @@ if (QT_QMAKE_EXECUTABLE AND
41 _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc) 41 _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc)
42 _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic) 42 _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic)
43 _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) 43 _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)
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 a59c680454..6c67dcf104 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
@@ -31,7 +31,7 @@ diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
31index 7ad981879..8b6f43cda 100644 31index 7ad981879..8b6f43cda 100644
32--- a/Modules/FindQt4.cmake 32--- a/Modules/FindQt4.cmake
33+++ b/Modules/FindQt4.cmake 33+++ b/Modules/FindQt4.cmake
34@@ -987,25 +987,26 @@ if (QT_QMAKE_EXECUTABLE AND 34@@ -988,25 +988,26 @@ if (QT_QMAKE_EXECUTABLE AND
35 endif() 35 endif()
36 endmacro() 36 endmacro()
37 37
diff --git a/meta/recipes-devtools/cmake/cmake_3.13.4.bb b/meta/recipes-devtools/cmake/cmake_3.14.0.bb
index e0457677e8..e0457677e8 100644
--- a/meta/recipes-devtools/cmake/cmake_3.13.4.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.14.0.bb