summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-31 17:52:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:31 +0100
commit334d35d9cab0e046f0709890ebda16dd815f4cf9 (patch)
tree24d8f8f2283060cdcd9d6c5840f1b4fc687f721c
parent1ac5e2d6314f9a4c6bc08ff1cc9f93b18dff3b7b (diff)
downloadpoky-334d35d9cab0e046f0709890ebda16dd815f4cf9.tar.gz
cmake: update 3.16.5 -> 3.17.3
License-Update: copyright years (From OE-Core rev: d28a97792f31e3de73a2f35ace16599c4295738d) 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.17.3.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.16.5.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc7
-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.patch16
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.17.3.bb (renamed from meta/recipes-devtools/cmake/cmake_3.16.5.bb)0
5 files changed, 12 insertions, 13 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.16.5.bb b/meta/recipes-devtools/cmake/cmake-native_3.17.3.bb
index b2952ee5f5..b2952ee5f5 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.16.5.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.17.3.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 09949b566c..7f0307c15b 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -10,8 +10,8 @@ HOMEPAGE = "http://www.cmake.org/"
10BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" 10BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"
11SECTION = "console/utils" 11SECTION = "console/utils"
12LICENSE = "BSD-3-Clause" 12LICENSE = "BSD-3-Clause"
13LIC_FILES_CHKSUM = "file://Copyright.txt;md5=622747147b46f22e1953876a7cba3323 \ 13LIC_FILES_CHKSUM = "file://Copyright.txt;md5=c721f56fce89ba2eadc2fdd8ba1f4d83 \
14 file://Source/cmake.h;md5=4494dee184212fc89c469c3acd555a14;beginline=1;endline=3 \ 14 file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14 \
15 " 15 "
16 16
17CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" 17CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
@@ -22,7 +22,6 @@ 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
25SRC_URI[md5sum] = "d86ccaf3d2462b6b5947919abe5b9f15" 25SRC_URI[sha256sum] = "0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40"
26SRC_URI[sha256sum] = "5f760b50b8ecc9c0c37135fae5fbf00a2fef617059aa9d61c1bb91653e5a8bfc"
27 26
28UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 27UPSTREAM_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 e2a58d25e2..f5c1a212f5 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 @@
1From ab272d703ce77f323aa1285526559c9efbf85834 Mon Sep 17 00:00:00 2001 1From d4aa2dbdc69774ad668756586d59331ad215a2c6 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] CMakeDetermineSystem: use oe environment vars to load default 4Subject: [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 61c8f27cd6..cf1dda7c9b 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 5a86c7fa987bd407f228176df2abeffd015be9ea Mon Sep 17 00:00:00 2001 1From 126994379ea75c8826874656bb55f955182ae911 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] cmake: Prevent the detection of Qt5 4Subject: [PATCH] cmake: Prevent the detection of Qt5
@@ -25,7 +25,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
25 7 files changed, 8 insertions(+), 9 deletions(-) 25 7 files changed, 8 insertions(+), 9 deletions(-)
26 26
27diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt 27diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
28index cb89d19..9e68981 100644 28index 98dd0e2..252302b 100644
29--- a/Source/QtDialog/CMakeLists.txt 29--- a/Source/QtDialog/CMakeLists.txt
30+++ b/Source/QtDialog/CMakeLists.txt 30+++ b/Source/QtDialog/CMakeLists.txt
31@@ -3,7 +3,7 @@ 31@@ -3,7 +3,7 @@
@@ -38,18 +38,18 @@ 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})
40diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt 40diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
41index 57fa7fc..d50c146 100644 41index aff7383..e220503 100644
42--- a/Tests/CMakeLists.txt 42--- a/Tests/CMakeLists.txt
43+++ b/Tests/CMakeLists.txt 43+++ b/Tests/CMakeLists.txt
44@@ -1329,7 +1329,7 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH 44@@ -215,7 +215,7 @@ if(BUILD_TESTING)
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)
48- find_package(Qt5Widgets QUIET NO_MODULE) 48- find_package(Qt5Widgets QUIET NO_MODULE)
49+ #find_package(Qt5Widgets QUIET NO_MODULE) 49+ #find_package(Qt5Widgets QUIET NO_MODULE)
50 endif() 50 endif()
51 if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND) 51
52 add_subdirectory(Qt5Autogen) 52 if(NOT CMake_TEST_EXTERNAL_CMAKE)
53diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt 53diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt
54index ad74961..a9dd74b 100644 54index ad74961..a9dd74b 100644
55--- a/Tests/Qt4And5Automoc/CMakeLists.txt 55--- a/Tests/Qt4And5Automoc/CMakeLists.txt
@@ -96,10 +96,10 @@ 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)
98diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt 98diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
99index 6b2f117..1002005 100644 99index e9f8bca..3a2da34 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@@ -376,7 +376,7 @@ else() 102@@ -396,7 +396,7 @@ else()
103 endif() 103 endif()
104 104
105 find_package(Qt4 QUIET) 105 find_package(Qt4 QUIET)
diff --git a/meta/recipes-devtools/cmake/cmake_3.16.5.bb b/meta/recipes-devtools/cmake/cmake_3.17.3.bb
index e0457677e8..e0457677e8 100644
--- a/meta/recipes-devtools/cmake/cmake_3.16.5.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.17.3.bb