Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From b4b6e9b1be33213ede3f612e87840c0045824d9e Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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 ++-- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 19 | Tests/QtAutogen/AutogenGuiTest.cmake | 3 +-- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 20 | Tests/QtAutogen/MacOsFW/CMakeLists.txt | 2 +- |
| 21 | Tests/RunCMake/CMakeLists.txt | 2 +- |
| 22 | Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 23 | 7 files changed, 8 insertions(+), 9 deletions(-) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 24 | |
| 25 | diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 26 | index 9ce0323844..06c86d63eb 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 39 | index ed98d974b0..7adfbc301b 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 40 | --- a/Tests/CMakeLists.txt |
| 41 | +++ b/Tests/CMakeLists.txt |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 42 | @@ -1342,7 +1342,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 52 | index ad74961d9f..a9dd74b151 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 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) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 69 | diff --git a/Tests/QtAutogen/AutogenGuiTest.cmake b/Tests/QtAutogen/AutogenGuiTest.cmake |
| 70 | index b76d341a45..a6e0acbafa 100644 |
| 71 | --- a/Tests/QtAutogen/AutogenGuiTest.cmake |
| 72 | +++ b/Tests/QtAutogen/AutogenGuiTest.cmake |
| 73 | @@ -22,8 +22,7 @@ if (QT_TEST_VERSION EQUAL 4) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 74 | endmacro() |
| 75 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 76 | elseif(QT_TEST_VERSION EQUAL 5) |
| 77 | - |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 78 | - find_package(Qt5Widgets REQUIRED) |
| 79 | + #find_package(Qt5Widgets REQUIRED) |
| 80 | |
| 81 | set(QT_QTCORE_TARGET Qt5::Core) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 82 | set(QT_LIBRARIES Qt5::Widgets) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 83 | diff --git a/Tests/QtAutogen/MacOsFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 84 | index c08efc47a2..87e25d9391 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 85 | --- a/Tests/QtAutogen/MacOsFW/CMakeLists.txt |
| 86 | +++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt |
| 87 | @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) |
| 88 | project(MacOsFW) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 89 | include("../AutogenGuiTest.cmake") |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 90 | |
| 91 | -find_package(Qt5Test REQUIRED) |
| 92 | +#find_package(Qt5Test REQUIRED) |
| 93 | |
| 94 | set(CMAKE_CXX_STANDARD 11) |
| 95 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) |
| 96 | diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 97 | index 1f3e5c3006..8ed8d6ac54 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 98 | --- a/Tests/RunCMake/CMakeLists.txt |
| 99 | +++ b/Tests/RunCMake/CMakeLists.txt |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 100 | @@ -326,7 +326,7 @@ add_RunCMake_test(configure_file) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 101 | add_RunCMake_test(CTestTimeoutAfterMatch) |
| 102 | |
| 103 | find_package(Qt4 QUIET) |
| 104 | -find_package(Qt5Core QUIET) |
| 105 | +#find_package(Qt5Core QUIET) |
| 106 | if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0) |
| 107 | add_RunCMake_test(IncompatibleQt) |
| 108 | endif() |
| 109 | diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 110 | index 4fccdc418f..b76e1e5313 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 111 | --- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
| 112 | +++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
| 113 | @@ -1,6 +1,6 @@ |
| 114 | |
| 115 | find_package(Qt4 REQUIRED) |
| 116 | -find_package(Qt5Core REQUIRED) |
| 117 | +#find_package(Qt5Core REQUIRED) |
| 118 | |
| 119 | add_executable(mainexe main.cpp) |
| 120 | target_link_libraries(mainexe Qt4::QtCore Qt5::Core) |
| 121 | -- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 122 | 2.11.0 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 123 | |