mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 03:32:12 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
1ac5e2d631
commit
334d35d9ca
@@ -10,8 +10,8 @@ HOMEPAGE = "http://www.cmake.org/"
|
||||
BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"
|
||||
SECTION = "console/utils"
|
||||
LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://Copyright.txt;md5=622747147b46f22e1953876a7cba3323 \
|
||||
file://Source/cmake.h;md5=4494dee184212fc89c469c3acd555a14;beginline=1;endline=3 \
|
||||
LIC_FILES_CHKSUM = "file://Copyright.txt;md5=c721f56fce89ba2eadc2fdd8ba1f4d83 \
|
||||
file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14 \
|
||||
"
|
||||
|
||||
CMAKE_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 \
|
||||
file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "d86ccaf3d2462b6b5947919abe5b9f15"
|
||||
SRC_URI[sha256sum] = "5f760b50b8ecc9c0c37135fae5fbf00a2fef617059aa9d61c1bb91653e5a8bfc"
|
||||
SRC_URI[sha256sum] = "0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40"
|
||||
|
||||
UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From ab272d703ce77f323aa1285526559c9efbf85834 Mon Sep 17 00:00:00 2001
|
||||
From d4aa2dbdc69774ad668756586d59331ad215a2c6 Mon Sep 17 00:00:00 2001
|
||||
From: Cody P Schafer <dev@codyps.com>
|
||||
Date: Thu, 27 Apr 2017 11:35:05 -0400
|
||||
Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 5a86c7fa987bd407f228176df2abeffd015be9ea Mon Sep 17 00:00:00 2001
|
||||
From 126994379ea75c8826874656bb55f955182ae911 Mon Sep 17 00:00:00 2001
|
||||
From: Otavio Salvador <otavio@ossystems.com.br>
|
||||
Date: Wed, 17 Jan 2018 10:02:14 -0200
|
||||
Subject: [PATCH] cmake: Prevent the detection of Qt5
|
||||
@@ -25,7 +25,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
||||
7 files changed, 8 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
|
||||
index cb89d19..9e68981 100644
|
||||
index 98dd0e2..252302b 100644
|
||||
--- a/Source/QtDialog/CMakeLists.txt
|
||||
+++ b/Source/QtDialog/CMakeLists.txt
|
||||
@@ -3,7 +3,7 @@
|
||||
@@ -38,18 +38,18 @@ index cb89d19..9e68981 100644
|
||||
include_directories(${Qt5Widgets_INCLUDE_DIRS})
|
||||
add_definitions(${Qt5Widgets_DEFINITONS})
|
||||
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
|
||||
index 57fa7fc..d50c146 100644
|
||||
index aff7383..e220503 100644
|
||||
--- a/Tests/CMakeLists.txt
|
||||
+++ b/Tests/CMakeLists.txt
|
||||
@@ -1329,7 +1329,7 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH
|
||||
@@ -215,7 +215,7 @@ if(BUILD_TESTING)
|
||||
set(CMake_TEST_Qt5 1)
|
||||
endif()
|
||||
if(CMake_TEST_Qt5)
|
||||
- find_package(Qt5Widgets QUIET NO_MODULE)
|
||||
+ #find_package(Qt5Widgets QUIET NO_MODULE)
|
||||
endif()
|
||||
if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND)
|
||||
add_subdirectory(Qt5Autogen)
|
||||
|
||||
if(NOT CMake_TEST_EXTERNAL_CMAKE)
|
||||
diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt
|
||||
index ad74961..a9dd74b 100644
|
||||
--- a/Tests/Qt4And5Automoc/CMakeLists.txt
|
||||
@@ -96,10 +96,10 @@ index c08efc4..87e25d9 100644
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin)
|
||||
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
|
||||
index 6b2f117..1002005 100644
|
||||
index e9f8bca..3a2da34 100644
|
||||
--- a/Tests/RunCMake/CMakeLists.txt
|
||||
+++ b/Tests/RunCMake/CMakeLists.txt
|
||||
@@ -376,7 +376,7 @@ else()
|
||||
@@ -396,7 +396,7 @@ else()
|
||||
endif()
|
||||
|
||||
find_package(Qt4 QUIET)
|
||||
|
||||
Reference in New Issue
Block a user