diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-17 16:11:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-02-17 16:11:20 (GMT) |
| commit | fa9bba4905f554fc51d2c7437f73073e0a87e8a5 (patch) | |
| tree | f38a2e0f3e419bfd87cb07df81ab1d4348d91a3e | |
| parent | 35967588116e96ea048c831fc2eae0a8c2061926 (diff) | |
| parent | 5bfff3c750762a2f8f8499279ed57f4729a188ab (diff) | |
| download | CMake-fa9bba4905f554fc51d2c7437f73073e0a87e8a5.zip CMake-fa9bba4905f554fc51d2c7437f73073e0a87e8a5.tar.gz CMake-fa9bba4905f554fc51d2c7437f73073e0a87e8a5.tar.bz2 | |
Merge branch 'test-qt-disable' into release-3.22
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 e24ef58..e8fb13f 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -580,12 +580,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() |