diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_3.16.1.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.15.5.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 4 | ||||
-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 | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.16.1.bb (renamed from meta/recipes-devtools/cmake/cmake_3.15.5.bb) | 0 |
7 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.15.5.bb b/meta/recipes-devtools/cmake/cmake-native_3.16.1.bb index b2952ee5f5..b2952ee5f5 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.15.5.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.16.1.bb | |||
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 24190dec02..9d14c14b54 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
@@ -22,7 +22,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ | |||
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 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[md5sum] = "5fe3ebca627b4c3dcc2f127fbcfbceba" | 25 | SRC_URI[md5sum] = "142cf11cd9a7c298cf875604cee96434" |
26 | SRC_URI[sha256sum] = "fbdd7cef15c0ced06bb13024bfda0ecc0dedbcaaaa6b8a5d368c75255243beb4" | 26 | SRC_URI[sha256sum] = "a275b3168fa8626eca4465da7bb159ff07c8c6cb0fb7179be59e12cbdfa725fd" |
27 | 27 | ||
28 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" | 28 | UPSTREAM_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 3720833d3e..e2a58d25e2 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 1e67c3fe52c6c51c00cf1ebb0bfc30c7a5ef9fdb Mon Sep 17 00:00:00 2001 | 1 | From ab272d703ce77f323aa1285526559c9efbf85834 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 index db229e63e2..61c8f27cd6 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 5cb6c86696f842274043e7d406f84b3ead1c36e0 Mon Sep 17 00:00:00 2001 | 1 | From 5a86c7fa987bd407f228176df2abeffd015be9ea 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 |
@@ -38,10 +38,10 @@ index cb89d19..9e68981 100644 | |||
38 | include_directories(${Qt5Widgets_INCLUDE_DIRS}) | 38 | include_directories(${Qt5Widgets_INCLUDE_DIRS}) |
39 | add_definitions(${Qt5Widgets_DEFINITONS}) | 39 | add_definitions(${Qt5Widgets_DEFINITONS}) |
40 | diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt | 40 | diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt |
41 | index e73b277..91b8b67 100644 | 41 | index 57fa7fc..d50c146 100644 |
42 | --- a/Tests/CMakeLists.txt | 42 | --- a/Tests/CMakeLists.txt |
43 | +++ b/Tests/CMakeLists.txt | 43 | +++ b/Tests/CMakeLists.txt |
44 | @@ -1348,7 +1348,7 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH | 44 | @@ -1329,7 +1329,7 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH |
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,11 +96,11 @@ 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 69f8162..f389523 100644 | 99 | index 6b2f117..1002005 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 | @@ -334,7 +334,7 @@ add_RunCMake_test(configure_file) | 102 | @@ -376,7 +376,7 @@ else() |
103 | add_RunCMake_test(CTestTimeoutAfterMatch) | 103 | endif() |
104 | 104 | ||
105 | find_package(Qt4 QUIET) | 105 | find_package(Qt4 QUIET) |
106 | -find_package(Qt5Core QUIET) | 106 | -find_package(Qt5Core QUIET) |
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 d7d87a5256..e30dc51e4a 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,4 +1,4 @@ | |||
1 | From b003857d3481105c473e2e75bad4e9e2c6e70004 Mon Sep 17 00:00:00 2001 | 1 | From e528861023bf69df0ad061a59fd4e527c9dde1ce 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: Thu, 12 May 2011 15:36:03 +0000 | 3 | Date: Thu, 12 May 2011 15:36:03 +0000 |
4 | Subject: [PATCH] cmake: support OpenEmbedded Qt4 tool binary names | 4 | Subject: [PATCH] cmake: support OpenEmbedded Qt4 tool binary names |
@@ -25,7 +25,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | |||
25 | 1 file changed, 5 insertions(+), 5 deletions(-) | 25 | 1 file changed, 5 insertions(+), 5 deletions(-) |
26 | 26 | ||
27 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake | 27 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake |
28 | index a145b46..7e18243 100644 | 28 | index 3993968..b2a8585 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() |
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 676e2857d7..48f43be837 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,4 +1,4 @@ | |||
1 | From d4a78e8739e845c2963666f7ef6a6c7a89827988 Mon Sep 17 00:00:00 2001 | 1 | From b0aeca35187983e22ec256a439cff4702dbde331 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: Thu, 5 Jul 2018 10:26:48 -0300 | 3 | Date: Thu, 5 Jul 2018 10:26:48 -0300 |
4 | Subject: [PATCH] Fail silently if system Qt installation is broken | 4 | Subject: [PATCH] Fail silently if system Qt installation is broken |
@@ -28,7 +28,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | |||
28 | 1 file changed, 20 insertions(+), 19 deletions(-) | 28 | 1 file changed, 20 insertions(+), 19 deletions(-) |
29 | 29 | ||
30 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake | 30 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake |
31 | index 7e18243..497d5c3 100644 | 31 | index b2a8585..77c89aa 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 |
diff --git a/meta/recipes-devtools/cmake/cmake_3.15.5.bb b/meta/recipes-devtools/cmake/cmake_3.16.1.bb index e0457677e8..e0457677e8 100644 --- a/meta/recipes-devtools/cmake/cmake_3.15.5.bb +++ b/meta/recipes-devtools/cmake/cmake_3.16.1.bb | |||