Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 875c11dbf87d1258ad7d3697a40d605d503e5673 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] 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/QtAutoUicInterface/CMakeLists.txt | 2 +- |
| 20 | Tests/QtAutogen/CMakeLists.txt | 2 +- |
| 21 | Tests/QtAutogen/macosFW/CMakeLists.txt | 2 +- |
| 22 | Tests/QtAutogen/mocDepends/CMakeLists.txt | 2 +- |
| 23 | Tests/QtAutogenRerun/CMakeLists.txt | 4 ++-- |
| 24 | Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt | 2 +- |
| 25 | Tests/QtAutogenRerun/mocRerun/CMakeLists.txt | 2 +- |
| 26 | Tests/QtAutogenRerun/rccDepends/CMakeLists.txt | 2 +- |
| 27 | Tests/RunCMake/CMakeLists.txt | 2 +- |
| 28 | Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +- |
| 29 | 13 files changed, 15 insertions(+), 15 deletions(-) |
| 30 | |
| 31 | diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt |
| 32 | index b38797bca..b5fbfc5fa 100644 |
| 33 | --- a/Source/QtDialog/CMakeLists.txt |
| 34 | +++ b/Source/QtDialog/CMakeLists.txt |
| 35 | @@ -6,7 +6,7 @@ if(POLICY CMP0020) |
| 36 | cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required |
| 37 | endif() |
| 38 | CMake_OPTIONAL_COMPONENT(cmake-gui) |
| 39 | -find_package(Qt5Widgets QUIET) |
| 40 | +#find_package(Qt5Widgets QUIET) |
| 41 | if (Qt5Widgets_FOUND) |
| 42 | include_directories(${Qt5Widgets_INCLUDE_DIRS}) |
| 43 | add_definitions(${Qt5Widgets_DEFINITONS}) |
| 44 | diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt |
| 45 | index 533788a44..32ef03c55 100644 |
| 46 | --- a/Tests/CMakeLists.txt |
| 47 | +++ b/Tests/CMakeLists.txt |
| 48 | @@ -1260,7 +1260,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release |
| 49 | set(CMake_TEST_Qt5 1) |
| 50 | endif() |
| 51 | if(CMake_TEST_Qt5) |
| 52 | - find_package(Qt5Widgets QUIET NO_MODULE) |
| 53 | + #find_package(Qt5Widgets QUIET NO_MODULE) |
| 54 | endif() |
| 55 | if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND) |
| 56 | add_test(NAME Qt5Autogen COMMAND ${CMAKE_CTEST_COMMAND} |
| 57 | diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt |
| 58 | index ad74961d9..a9dd74b15 100644 |
| 59 | --- a/Tests/Qt4And5Automoc/CMakeLists.txt |
| 60 | +++ b/Tests/Qt4And5Automoc/CMakeLists.txt |
| 61 | @@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12) |
| 62 | project(Qt4And5Automoc) |
| 63 | |
| 64 | if (QT_REVERSE_FIND_ORDER) |
| 65 | - find_package(Qt5Core REQUIRED) |
| 66 | + #find_package(Qt5Core REQUIRED) |
| 67 | find_package(Qt4 REQUIRED) |
| 68 | else() |
| 69 | find_package(Qt4 REQUIRED) |
| 70 | - find_package(Qt5Core REQUIRED) |
| 71 | + #find_package(Qt5Core REQUIRED) |
| 72 | endif() |
| 73 | |
| 74 | set(CMAKE_AUTOMOC ON) |
| 75 | diff --git a/Tests/QtAutoUicInterface/CMakeLists.txt b/Tests/QtAutoUicInterface/CMakeLists.txt |
| 76 | index a5c2d99b2..2d640e4a3 100644 |
| 77 | --- a/Tests/QtAutoUicInterface/CMakeLists.txt |
| 78 | +++ b/Tests/QtAutoUicInterface/CMakeLists.txt |
| 79 | @@ -14,7 +14,7 @@ else() |
| 80 | if (NOT QT_TEST_VERSION STREQUAL 5) |
| 81 | message(SEND_ERROR "Invalid Qt version specified.") |
| 82 | endif() |
| 83 | - find_package(Qt5Widgets REQUIRED) |
| 84 | + #find_package(Qt5Widgets REQUIRED) |
| 85 | |
| 86 | set(QT_CORE_TARGET Qt5::Core) |
| 87 | set(QT_GUI_TARGET Qt5::Widgets) |
| 88 | diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt |
| 89 | index dff9d0c66..c6e8fc3f5 100644 |
| 90 | --- a/Tests/QtAutogen/CMakeLists.txt |
| 91 | +++ b/Tests/QtAutogen/CMakeLists.txt |
| 92 | @@ -23,7 +23,7 @@ else() |
| 93 | if (NOT QT_TEST_VERSION STREQUAL 5) |
| 94 | message(SEND_ERROR "Invalid Qt version specified.") |
| 95 | endif() |
| 96 | - find_package(Qt5Widgets REQUIRED) |
| 97 | + #find_package(Qt5Widgets REQUIRED) |
| 98 | |
| 99 | set(QT_QTCORE_TARGET Qt5::Core) |
| 100 | |
| 101 | diff --git a/Tests/QtAutogen/macosFW/CMakeLists.txt b/Tests/QtAutogen/macosFW/CMakeLists.txt |
| 102 | index 114d9bac0..157fe0aaa 100644 |
| 103 | --- a/Tests/QtAutogen/macosFW/CMakeLists.txt |
| 104 | +++ b/Tests/QtAutogen/macosFW/CMakeLists.txt |
| 105 | @@ -1,7 +1,7 @@ |
| 106 | cmake_minimum_required(VERSION 3.8) |
| 107 | project(macos-fw-test) |
| 108 | |
| 109 | -find_package(Qt5Test REQUIRED) |
| 110 | +#find_package(Qt5Test REQUIRED) |
| 111 | |
| 112 | set(CMAKE_CXX_STANDARD 11) |
| 113 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) |
| 114 | diff --git a/Tests/QtAutogen/mocDepends/CMakeLists.txt b/Tests/QtAutogen/mocDepends/CMakeLists.txt |
| 115 | index 8217b8dbf..86bb7bc7f 100644 |
| 116 | --- a/Tests/QtAutogen/mocDepends/CMakeLists.txt |
| 117 | +++ b/Tests/QtAutogen/mocDepends/CMakeLists.txt |
| 118 | @@ -10,7 +10,7 @@ else() |
| 119 | message(SEND_ERROR "Invalid Qt version specified.") |
| 120 | endif() |
| 121 | |
| 122 | - find_package(Qt5Core REQUIRED) |
| 123 | + #find_package(Qt5Core REQUIRED) |
| 124 | set(QT_CORE_TARGET Qt5::Core) |
| 125 | endif() |
| 126 | |
| 127 | diff --git a/Tests/QtAutogenRerun/CMakeLists.txt b/Tests/QtAutogenRerun/CMakeLists.txt |
| 128 | index e72c1912e..d7e6884ce 100644 |
| 129 | --- a/Tests/QtAutogenRerun/CMakeLists.txt |
| 130 | +++ b/Tests/QtAutogenRerun/CMakeLists.txt |
| 131 | @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.9) |
| 132 | cmake_policy(SET CMP0071 NEW) |
| 133 | project(QtAutogenRerun) |
| 134 | |
| 135 | -# Tell find_package(Qt5) where to find Qt. |
| 136 | +# Tell #find_package(Qt5) where to find Qt. |
| 137 | if(QT_QMAKE_EXECUTABLE) |
| 138 | get_filename_component(Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH) |
| 139 | get_filename_component(Qt_PREFIX_DIR "${Qt_BIN_DIR}" PATH) |
| 140 | @@ -23,7 +23,7 @@ else() |
| 141 | if (NOT QT_TEST_VERSION STREQUAL 5) |
| 142 | message(SEND_ERROR "Invalid Qt version specified.") |
| 143 | endif() |
| 144 | - find_package(Qt5Widgets REQUIRED) |
| 145 | + #find_package(Qt5Widgets REQUIRED) |
| 146 | |
| 147 | set(QT_QTCORE_TARGET Qt5::Core) |
| 148 | |
| 149 | diff --git a/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt b/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt |
| 150 | index b7cc5e9ff..e1d109953 100644 |
| 151 | --- a/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt |
| 152 | +++ b/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt |
| 153 | @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC_DEPEND_FILTERS |
| 154 | if (NOT QT_TEST_VERSION STREQUAL 5) |
| 155 | message(SEND_ERROR "Invalid Qt version specified.") |
| 156 | endif() |
| 157 | -find_package(Qt5Widgets REQUIRED) |
| 158 | +#find_package(Qt5Widgets REQUIRED) |
| 159 | |
| 160 | if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC) |
| 161 | add_definitions(${CMAKE_CXX_COMPILE_OPTIONS_PIC}) |
| 162 | diff --git a/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt b/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt |
| 163 | index bafd9cf48..43ec933d2 100644 |
| 164 | --- a/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt |
| 165 | +++ b/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt |
| 166 | @@ -10,7 +10,7 @@ else() |
| 167 | message(SEND_ERROR "Invalid Qt version specified.") |
| 168 | endif() |
| 169 | |
| 170 | - find_package(Qt5Core REQUIRED) |
| 171 | + #find_package(Qt5Core REQUIRED) |
| 172 | set(QT_CORE_TARGET Qt5::Core) |
| 173 | endif() |
| 174 | |
| 175 | diff --git a/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt b/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt |
| 176 | index 291592e7d..40cd52868 100644 |
| 177 | --- a/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt |
| 178 | +++ b/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt |
| 179 | @@ -9,7 +9,7 @@ else() |
| 180 | message(SEND_ERROR "Invalid Qt version specified.") |
| 181 | endif() |
| 182 | |
| 183 | - find_package(Qt5Core REQUIRED) |
| 184 | + #find_package(Qt5Core REQUIRED) |
| 185 | set(QT_CORE_TARGET Qt5::Core) |
| 186 | endif() |
| 187 | |
| 188 | diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt |
| 189 | index 29325ff0a..d30d01e78 100644 |
| 190 | --- a/Tests/RunCMake/CMakeLists.txt |
| 191 | +++ b/Tests/RunCMake/CMakeLists.txt |
| 192 | @@ -274,7 +274,7 @@ add_RunCMake_test(configure_file) |
| 193 | add_RunCMake_test(CTestTimeoutAfterMatch) |
| 194 | |
| 195 | find_package(Qt4 QUIET) |
| 196 | -find_package(Qt5Core QUIET) |
| 197 | +#find_package(Qt5Core QUIET) |
| 198 | if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0) |
| 199 | add_RunCMake_test(IncompatibleQt) |
| 200 | endif() |
| 201 | diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
| 202 | index 4fccdc418..b76e1e531 100644 |
| 203 | --- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
| 204 | +++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
| 205 | @@ -1,6 +1,6 @@ |
| 206 | |
| 207 | find_package(Qt4 REQUIRED) |
| 208 | -find_package(Qt5Core REQUIRED) |
| 209 | +#find_package(Qt5Core REQUIRED) |
| 210 | |
| 211 | add_executable(mainexe main.cpp) |
| 212 | target_link_libraries(mainexe Qt4::QtCore Qt5::Core) |
| 213 | -- |
| 214 | 2.15.1 |
| 215 | |