Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 1 | From 106cf5134d22db889e4ddf2f98ec302d5f4b9ca7 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 |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 4 | Subject: [PATCH] cmake: Prevent the detection of Qt5 |
| 5 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 6 | Organization: O.S. Systems Software LTDA. |
| 7 | |
| 8 | CMake doesn't have dependency on qt4/qt5, so these tests usually fail |
| 9 | but still can cause undeterministic results or build failures (when |
| 10 | OE_QMAKE_PATH_EXTERNAL_HOST_BINS is undefined or native qmake removed |
| 11 | while running the test in cmake) |
| 12 | |
| 13 | Upstream-Status: Inappropriate [configuration] |
| 14 | |
| 15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 16 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 17 | --- |
| 18 | Source/QtDialog/CMakeLists.txt | 2 +- |
| 19 | Tests/CMakeLists.txt | 2 +- |
| 20 | Tests/Qt4And5Automoc/CMakeLists.txt | 4 ++-- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 21 | Tests/QtAutogen/AutogenGuiTest.cmake | 3 +-- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 22 | Tests/QtAutogen/MacOsFW/CMakeLists.txt | 2 +- |
| 23 | Tests/RunCMake/CMakeLists.txt | 2 +- |
| 24 | Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 25 | 7 files changed, 8 insertions(+), 9 deletions(-) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 26 | |
| 27 | diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt |
Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 28 | index 98dd0e2..252302b 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 29 | --- a/Source/QtDialog/CMakeLists.txt |
| 30 | +++ b/Source/QtDialog/CMakeLists.txt |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 31 | @@ -3,7 +3,7 @@ |
| 32 | |
| 33 | project(QtDialog) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 34 | CMake_OPTIONAL_COMPONENT(cmake-gui) |
Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 35 | -find_package(Qt5Widgets QUIET) |
| 36 | +#find_package(Qt5Widgets QUIET) |
| 37 | if (Qt5Widgets_FOUND) |
| 38 | include_directories(${Qt5Widgets_INCLUDE_DIRS}) |
| 39 | add_definitions(${Qt5Widgets_DEFINITONS}) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 40 | diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt |
Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 41 | index db6dbf3..5b26879 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 42 | --- a/Tests/CMakeLists.txt |
| 43 | +++ b/Tests/CMakeLists.txt |
Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 44 | @@ -215,7 +215,7 @@ if(BUILD_TESTING) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 45 | set(CMake_TEST_Qt5 1) |
| 46 | endif() |
| 47 | if(CMake_TEST_Qt5) |
| 48 | - find_package(Qt5Widgets QUIET NO_MODULE) |
| 49 | + #find_package(Qt5Widgets QUIET NO_MODULE) |
| 50 | endif() |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 51 | |
| 52 | if(NOT CMake_TEST_EXTERNAL_CMAKE) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 53 | diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 54 | index ad74961..a9dd74b 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 55 | --- a/Tests/Qt4And5Automoc/CMakeLists.txt |
| 56 | +++ b/Tests/Qt4And5Automoc/CMakeLists.txt |
| 57 | @@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12) |
| 58 | project(Qt4And5Automoc) |
| 59 | |
| 60 | if (QT_REVERSE_FIND_ORDER) |
| 61 | - find_package(Qt5Core REQUIRED) |
| 62 | + #find_package(Qt5Core REQUIRED) |
| 63 | find_package(Qt4 REQUIRED) |
| 64 | else() |
| 65 | find_package(Qt4 REQUIRED) |
| 66 | - find_package(Qt5Core REQUIRED) |
| 67 | + #find_package(Qt5Core REQUIRED) |
| 68 | endif() |
| 69 | |
| 70 | set(CMAKE_AUTOMOC ON) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 71 | diff --git a/Tests/QtAutogen/AutogenGuiTest.cmake b/Tests/QtAutogen/AutogenGuiTest.cmake |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 72 | index b76d341..a6e0acb 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 73 | --- a/Tests/QtAutogen/AutogenGuiTest.cmake |
| 74 | +++ b/Tests/QtAutogen/AutogenGuiTest.cmake |
| 75 | @@ -22,8 +22,7 @@ if (QT_TEST_VERSION EQUAL 4) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 76 | endmacro() |
| 77 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 78 | elseif(QT_TEST_VERSION EQUAL 5) |
| 79 | - |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 80 | - find_package(Qt5Widgets REQUIRED) |
| 81 | + #find_package(Qt5Widgets REQUIRED) |
| 82 | |
| 83 | set(QT_QTCORE_TARGET Qt5::Core) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 84 | set(QT_LIBRARIES Qt5::Widgets) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 85 | diff --git a/Tests/QtAutogen/MacOsFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 86 | index c08efc4..87e25d9 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 87 | --- a/Tests/QtAutogen/MacOsFW/CMakeLists.txt |
| 88 | +++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt |
| 89 | @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) |
| 90 | project(MacOsFW) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 91 | include("../AutogenGuiTest.cmake") |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 92 | |
| 93 | -find_package(Qt5Test REQUIRED) |
| 94 | +#find_package(Qt5Test REQUIRED) |
| 95 | |
| 96 | set(CMAKE_CXX_STANDARD 11) |
| 97 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) |
| 98 | diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt |
Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 99 | index 10e66c3..ecc4eeb 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 100 | --- a/Tests/RunCMake/CMakeLists.txt |
| 101 | +++ b/Tests/RunCMake/CMakeLists.txt |
Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 102 | @@ -440,7 +440,7 @@ if(NOT WIN32) |
Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame] | 103 | endif () |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 104 | |
| 105 | find_package(Qt4 QUIET) |
| 106 | -find_package(Qt5Core QUIET) |
| 107 | +#find_package(Qt5Core QUIET) |
| 108 | if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0) |
| 109 | add_RunCMake_test(IncompatibleQt) |
| 110 | endif() |
| 111 | diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 112 | index 4fccdc4..b76e1e5 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 113 | --- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
| 114 | +++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
| 115 | @@ -1,6 +1,6 @@ |
| 116 | |
| 117 | find_package(Qt4 REQUIRED) |
| 118 | -find_package(Qt5Core REQUIRED) |
| 119 | +#find_package(Qt5Core REQUIRED) |
| 120 | |
| 121 | add_executable(mainexe main.cpp) |
| 122 | target_link_libraries(mainexe Qt4::QtCore Qt5::Core) |