diff options
author | Pascal Bach <pascal.bach@siemens.com> | 2019-02-12 17:19:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-14 11:20:55 +0000 |
commit | 2daa03ecfeaf940314bd36454de48085a7b541a3 (patch) | |
tree | a89282a833d56ce564a647cde44e6ab62b2fe3c5 /meta/recipes-devtools/cmake/cmake | |
parent | 471114bbc2530314e471b8e7b4dca6c950df7795 (diff) | |
download | poky-2daa03ecfeaf940314bd36454de48085a7b541a3.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | 2 |
2 files changed, 5 insertions, 5 deletions
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 6f788ada00..3bea6935b7 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 | |||
@@ -39,7 +39,7 @@ diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt | |||
39 | index b8b724ed8..63f6bb6d2 100644 | 39 | index b8b724ed8..63f6bb6d2 100644 |
40 | --- a/Tests/CMakeLists.txt | 40 | --- a/Tests/CMakeLists.txt |
41 | +++ b/Tests/CMakeLists.txt | 41 | +++ b/Tests/CMakeLists.txt |
42 | @@ -1322,7 +1322,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release | 42 | @@ -1297,7 +1297,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) |
@@ -70,10 +70,10 @@ diff --git a/Tests/QtAutogen/AutogenTest.cmake b/Tests/QtAutogen/AutogenTest.cma | |||
70 | index 8c0a14fca..e9923b21a 100644 | 70 | index 8c0a14fca..e9923b21a 100644 |
71 | --- a/Tests/QtAutogen/AutogenTest.cmake | 71 | --- a/Tests/QtAutogen/AutogenTest.cmake |
72 | +++ b/Tests/QtAutogen/AutogenTest.cmake | 72 | +++ b/Tests/QtAutogen/AutogenTest.cmake |
73 | @@ -22,7 +22,7 @@ if (QT_TEST_VERSION STREQUAL 4) | 73 | @@ -22,7 +22,7 @@ if (QT_TEST_VERSION EQUAL 4) |
74 | endmacro() | 74 | endmacro() |
75 | 75 | ||
76 | elseif(QT_TEST_VERSION STREQUAL 5) | 76 | elseif(QT_TEST_VERSION EQUAL 5) |
77 | - find_package(Qt5Widgets REQUIRED) | 77 | - find_package(Qt5Widgets REQUIRED) |
78 | + #find_package(Qt5Widgets REQUIRED) | 78 | + #find_package(Qt5Widgets REQUIRED) |
79 | 79 | ||
@@ -96,7 +96,7 @@ diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt | |||
96 | index 637c5c2cb..c0376effc 100644 | 96 | index 637c5c2cb..c0376effc 100644 |
97 | --- a/Tests/RunCMake/CMakeLists.txt | 97 | --- a/Tests/RunCMake/CMakeLists.txt |
98 | +++ b/Tests/RunCMake/CMakeLists.txt | 98 | +++ b/Tests/RunCMake/CMakeLists.txt |
99 | @@ -291,7 +291,7 @@ add_RunCMake_test(configure_file) | 99 | @@ -310,7 +310,7 @@ add_RunCMake_test(configure_file) |
100 | add_RunCMake_test(CTestTimeoutAfterMatch) | 100 | add_RunCMake_test(CTestTimeoutAfterMatch) |
101 | 101 | ||
102 | find_package(Qt4 QUIET) | 102 | find_package(Qt4 QUIET) |
diff --git a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch index 23ce8e9e4a..ad42d409d9 100644 --- a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch +++ b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | |||
@@ -20,7 +20,7 @@ diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMak | |||
20 | index 206f3c6a5..642fb0dd9 100644 | 20 | index 206f3c6a5..642fb0dd9 100644 |
21 | --- a/Utilities/cmlibarchive/CMakeLists.txt | 21 | --- a/Utilities/cmlibarchive/CMakeLists.txt |
22 | +++ b/Utilities/cmlibarchive/CMakeLists.txt | 22 | +++ b/Utilities/cmlibarchive/CMakeLists.txt |
23 | @@ -400,12 +400,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) | 23 | @@ -430,12 +430,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) |
24 | LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) | 24 | LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) |
25 | LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) | 25 | LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) |
26 | LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) | 26 | LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) |