summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2019-12-12 09:25:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-16 23:25:49 +0000
commit580e45c7633efde6013d5acbb4042dc010d3c3fe (patch)
tree3bbac7e362db15225880d70f71ef26c3b8ffe3cb /meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
parentb8ce0c92e27819cd3afab2fd6665325c3555a6c4 (diff)
downloadpoky-580e45c7633efde6013d5acbb4042dc010d3c3fe.tar.gz
cmake: 3.15.5 -> 3.16.1
Patches have been refreshed and all of meta-oe and oe-core was sucessfully built. (From OE-Core rev: 469bcfbfe25afd9c480c26f117b81d65cc305fbe) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch')
-rw-r--r--meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch12
1 files changed, 6 insertions, 6 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 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 @@
1From 5cb6c86696f842274043e7d406f84b3ead1c36e0 Mon Sep 17 00:00:00 2001 1From 5a86c7fa987bd407f228176df2abeffd015be9ea 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
@@ -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})
40diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt 40diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
41index e73b277..91b8b67 100644 41index 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)
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 69f8162..f389523 100644 99index 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)