From 5bfff3c750762a2f8f8499279ed57f4729a188ab Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 17 Feb 2022 10:57:06 -0500 Subject: Tests: Add missing guards on Qt4 and Qt5 tests Add missing `CMake_TEST_Qt{4,5}` conditions on Qt4 an Qt5 tests. Configuring CMake with `-DCMake_TEST_Qt5=OFF` should prevent any attempt to search for Qt5. Fixes: #23239 --- Tests/RunCMake/CMakeLists.txt | 12 ++++++++---- 1 file 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() -- cgit v0.12