mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 12:32:15 +02:00
cmake: update to 3.13.4
All patches have been rebased on top of the 3.13.4 release. I successfully built all CMake recipes in oe-core and meta-oe. (From OE-Core rev: f40a5da14ec688f751d6394ce9a997578904fd8d) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Cc: Otavio Salvador <otavio.salvador@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
471114bbc2
commit
2daa03ecfe
@@ -18,7 +18,7 @@ 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] = "6e7c550cfa1c2e216b35903dc70d80af"
|
||||
SRC_URI[sha256sum] = "0f97485799e51a7070cc11494f3e02349b0fc3a24cc12b082e737bf67a0581a4"
|
||||
SRC_URI[md5sum] = "b5a544ffc73f6922a6cf371fcb6bae22"
|
||||
SRC_URI[sha256sum] = "fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b"
|
||||
|
||||
UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
@@ -39,7 +39,7 @@ diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
|
||||
index b8b724ed8..63f6bb6d2 100644
|
||||
--- a/Tests/CMakeLists.txt
|
||||
+++ b/Tests/CMakeLists.txt
|
||||
@@ -1322,7 +1322,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
|
||||
@@ -1297,7 +1297,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
|
||||
set(CMake_TEST_Qt5 1)
|
||||
endif()
|
||||
if(CMake_TEST_Qt5)
|
||||
@@ -70,10 +70,10 @@ diff --git a/Tests/QtAutogen/AutogenTest.cmake b/Tests/QtAutogen/AutogenTest.cma
|
||||
index 8c0a14fca..e9923b21a 100644
|
||||
--- a/Tests/QtAutogen/AutogenTest.cmake
|
||||
+++ b/Tests/QtAutogen/AutogenTest.cmake
|
||||
@@ -22,7 +22,7 @@ if (QT_TEST_VERSION STREQUAL 4)
|
||||
@@ -22,7 +22,7 @@ if (QT_TEST_VERSION EQUAL 4)
|
||||
endmacro()
|
||||
|
||||
elseif(QT_TEST_VERSION STREQUAL 5)
|
||||
elseif(QT_TEST_VERSION EQUAL 5)
|
||||
- find_package(Qt5Widgets REQUIRED)
|
||||
+ #find_package(Qt5Widgets REQUIRED)
|
||||
|
||||
@@ -96,7 +96,7 @@ diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
|
||||
index 637c5c2cb..c0376effc 100644
|
||||
--- a/Tests/RunCMake/CMakeLists.txt
|
||||
+++ b/Tests/RunCMake/CMakeLists.txt
|
||||
@@ -291,7 +291,7 @@ add_RunCMake_test(configure_file)
|
||||
@@ -310,7 +310,7 @@ add_RunCMake_test(configure_file)
|
||||
add_RunCMake_test(CTestTimeoutAfterMatch)
|
||||
|
||||
find_package(Qt4 QUIET)
|
||||
|
||||
@@ -20,7 +20,7 @@ diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMak
|
||||
index 206f3c6a5..642fb0dd9 100644
|
||||
--- a/Utilities/cmlibarchive/CMakeLists.txt
|
||||
+++ b/Utilities/cmlibarchive/CMakeLists.txt
|
||||
@@ -400,12 +400,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H)
|
||||
@@ -430,12 +430,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H)
|
||||
LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H)
|
||||
LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
|
||||
LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
|
||||
|
||||
Reference in New Issue
Block a user