diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-18 13:52:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-18 13:52:48 (GMT) |
| commit | e9832cc298acaa23fb4e76142fc0b59743d1f10f (patch) | |
| tree | b2410c7a68c8d9850043271c8bee35de98a01b7a | |
| parent | abc12c4e96961a3d2142972e55c01031db3b9d75 (diff) | |
| parent | 5bfff3c750762a2f8f8499279ed57f4729a188ab (diff) | |
| download | CMake-e9832cc298acaa23fb4e76142fc0b59743d1f10f.zip CMake-e9832cc298acaa23fb4e76142fc0b59743d1f10f.tar.gz CMake-e9832cc298acaa23fb4e76142fc0b59743d1f10f.tar.bz2 | |
Merge topic 'test-qt-disable' into release-3.23
5bfff3c750 Tests: Add missing guards on Qt4 and Qt5 tests
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6998
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 6087021..e97b7dc 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -585,12 +585,16 @@ if(NOT WIN32 add_RunCMake_test(SymlinkTrees) endif () -find_package(Qt4 QUIET) -find_package(Qt5Core QUIET) -if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0) +if(CMake_TEST_Qt4) + find_package(Qt4 QUIET) +endif() +if(CMake_TEST_Qt5) + find_package(Qt5Core QUIET) +endif() +if (CMake_TEST_Qt4 AND CMake_TEST_Qt5 AND QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0) add_RunCMake_test(IncompatibleQt) endif() -if (QT4_FOUND) +if (CMake_TEST_Qt4 AND QT4_FOUND) add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}) endif() |