diff options
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.patch | 10 |
1 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 cf1dda7c9b..162bfe5783 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 @@ | |||
1 | From 126994379ea75c8826874656bb55f955182ae911 Mon Sep 17 00:00:00 2001 | 1 | From 106cf5134d22db889e4ddf2f98ec302d5f4b9ca7 Mon Sep 17 00:00:00 2001 |
2 | From: Otavio Salvador <otavio@ossystems.com.br> | 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
3 | Date: Wed, 17 Jan 2018 10:02:14 -0200 | 3 | Date: Wed, 17 Jan 2018 10:02:14 -0200 |
4 | Subject: [PATCH] cmake: Prevent the detection of Qt5 | 4 | Subject: [PATCH] cmake: Prevent the detection of Qt5 |
@@ -38,7 +38,7 @@ index 98dd0e2..252302b 100644 | |||
38 | include_directories(${Qt5Widgets_INCLUDE_DIRS}) | 38 | include_directories(${Qt5Widgets_INCLUDE_DIRS}) |
39 | add_definitions(${Qt5Widgets_DEFINITONS}) | 39 | add_definitions(${Qt5Widgets_DEFINITONS}) |
40 | diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt | 40 | diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt |
41 | index aff7383..e220503 100644 | 41 | index db6dbf3..5b26879 100644 |
42 | --- a/Tests/CMakeLists.txt | 42 | --- a/Tests/CMakeLists.txt |
43 | +++ b/Tests/CMakeLists.txt | 43 | +++ b/Tests/CMakeLists.txt |
44 | @@ -215,7 +215,7 @@ if(BUILD_TESTING) | 44 | @@ -215,7 +215,7 @@ if(BUILD_TESTING) |
@@ -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) |
98 | diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt | 98 | diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt |
99 | index e9f8bca..3a2da34 100644 | 99 | index 10e66c3..ecc4eeb 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 | @@ -396,7 +396,7 @@ else() | 102 | @@ -440,7 +440,7 @@ if(NOT WIN32) |
103 | endif() | 103 | endif () |
104 | 104 | ||
105 | find_package(Qt4 QUIET) | 105 | find_package(Qt4 QUIET) |
106 | -find_package(Qt5Core QUIET) | 106 | -find_package(Qt5Core QUIET) |