Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 7a1f4e724f9c68498f401244c2938e784a2e6fbd Mon Sep 17 00:00:00 2001 |
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
| 3 | Date: Wed, 17 Jan 2018 10:02:14 -0200 |
| 4 | Subject: [PATCH 2/5] cmake: Prevent the detection of Qt5 |
| 5 | Organization: O.S. Systems Software LTDA. |
| 6 | |
| 7 | CMake doesn't have dependency on qt4/qt5, so these tests usually fail |
| 8 | but still can cause undeterministic results or build failures (when |
| 9 | OE_QMAKE_PATH_EXTERNAL_HOST_BINS is undefined or native qmake removed |
| 10 | while running the test in cmake) |
| 11 | |
| 12 | Upstream-Status: Inappropriate [configuration] |
| 13 | |
| 14 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
| 15 | --- |
| 16 | Source/QtDialog/CMakeLists.txt | 2 +- |
| 17 | Tests/CMakeLists.txt | 2 +- |
| 18 | Tests/Qt4And5Automoc/CMakeLists.txt | 4 ++-- |
| 19 | Tests/QtAutogen/AutogenTest.cmake | 2 +- |
| 20 | Tests/QtAutogen/MacOsFW/CMakeLists.txt | 2 +- |
| 21 | Tests/RunCMake/CMakeLists.txt | 2 +- |
| 22 | Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +- |
| 23 | 7 files changed, 8 insertions(+), 8 deletions(-) |
| 24 | |
| 25 | diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt |
| 26 | index 330b74729..e7709dee6 100644 |
| 27 | --- a/Source/QtDialog/CMakeLists.txt |
| 28 | +++ b/Source/QtDialog/CMakeLists.txt |
| 29 | @@ -6,7 +6,7 @@ if(POLICY CMP0020) |
| 30 | cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required |
| 31 | endif() |
| 32 | CMake_OPTIONAL_COMPONENT(cmake-gui) |
| 33 | -find_package(Qt5Widgets QUIET) |
| 34 | +#find_package(Qt5Widgets QUIET) |
| 35 | if (Qt5Widgets_FOUND) |
| 36 | include_directories(${Qt5Widgets_INCLUDE_DIRS}) |
| 37 | add_definitions(${Qt5Widgets_DEFINITONS}) |
| 38 | diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt |
| 39 | index b8b724ed8..63f6bb6d2 100644 |
| 40 | --- a/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 |
| 43 | set(CMake_TEST_Qt5 1) |
| 44 | endif() |
| 45 | if(CMake_TEST_Qt5) |
| 46 | - find_package(Qt5Widgets QUIET NO_MODULE) |
| 47 | + #find_package(Qt5Widgets QUIET NO_MODULE) |
| 48 | endif() |
| 49 | if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND) |
| 50 | add_subdirectory(Qt5Autogen) |
| 51 | diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt |
| 52 | index ad74961d9..a9dd74b15 100644 |
| 53 | --- a/Tests/Qt4And5Automoc/CMakeLists.txt |
| 54 | +++ b/Tests/Qt4And5Automoc/CMakeLists.txt |
| 55 | @@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12) |
| 56 | project(Qt4And5Automoc) |
| 57 | |
| 58 | if (QT_REVERSE_FIND_ORDER) |
| 59 | - find_package(Qt5Core REQUIRED) |
| 60 | + #find_package(Qt5Core REQUIRED) |
| 61 | find_package(Qt4 REQUIRED) |
| 62 | else() |
| 63 | find_package(Qt4 REQUIRED) |
| 64 | - find_package(Qt5Core REQUIRED) |
| 65 | + #find_package(Qt5Core REQUIRED) |
| 66 | endif() |
| 67 | |
| 68 | set(CMAKE_AUTOMOC ON) |
| 69 | diff --git a/Tests/QtAutogen/AutogenTest.cmake b/Tests/QtAutogen/AutogenTest.cmake |
| 70 | index 8c0a14fca..e9923b21a 100644 |
| 71 | --- a/Tests/QtAutogen/AutogenTest.cmake |
| 72 | +++ b/Tests/QtAutogen/AutogenTest.cmake |
| 73 | @@ -22,7 +22,7 @@ if (QT_TEST_VERSION STREQUAL 4) |
| 74 | endmacro() |
| 75 | |
| 76 | elseif(QT_TEST_VERSION STREQUAL 5) |
| 77 | - find_package(Qt5Widgets REQUIRED) |
| 78 | + #find_package(Qt5Widgets REQUIRED) |
| 79 | |
| 80 | set(QT_QTCORE_TARGET Qt5::Core) |
| 81 | set(QT_QTGUI_TARGET Qt5::Widgets) |
| 82 | diff --git a/Tests/QtAutogen/MacOsFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt |
| 83 | index 26d201926..e48e1c8de 100644 |
| 84 | --- a/Tests/QtAutogen/MacOsFW/CMakeLists.txt |
| 85 | +++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt |
| 86 | @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) |
| 87 | project(MacOsFW) |
| 88 | include("../AutogenTest.cmake") |
| 89 | |
| 90 | -find_package(Qt5Test REQUIRED) |
| 91 | +#find_package(Qt5Test REQUIRED) |
| 92 | |
| 93 | set(CMAKE_CXX_STANDARD 11) |
| 94 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) |
| 95 | diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt |
| 96 | index 637c5c2cb..c0376effc 100644 |
| 97 | --- a/Tests/RunCMake/CMakeLists.txt |
| 98 | +++ b/Tests/RunCMake/CMakeLists.txt |
| 99 | @@ -291,7 +291,7 @@ add_RunCMake_test(configure_file) |
| 100 | add_RunCMake_test(CTestTimeoutAfterMatch) |
| 101 | |
| 102 | find_package(Qt4 QUIET) |
| 103 | -find_package(Qt5Core QUIET) |
| 104 | +#find_package(Qt5Core QUIET) |
| 105 | if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0) |
| 106 | add_RunCMake_test(IncompatibleQt) |
| 107 | endif() |
| 108 | diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
| 109 | index 4fccdc418..b76e1e531 100644 |
| 110 | --- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
| 111 | +++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
| 112 | @@ -1,6 +1,6 @@ |
| 113 | |
| 114 | find_package(Qt4 REQUIRED) |
| 115 | -find_package(Qt5Core REQUIRED) |
| 116 | +#find_package(Qt5Core REQUIRED) |
| 117 | |
| 118 | add_executable(mainexe main.cpp) |
| 119 | target_link_libraries(mainexe Qt4::QtCore Qt5::Core) |
| 120 | -- |
| 121 | 2.18.0 |
| 122 | |