summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
diff options
context:
space:
mode:
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.patch16
1 files changed, 8 insertions, 8 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 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)