Merge branch 'test-qt-disable' into release-3.22

Merge-request: !6998
This commit is contained in:
Brad King
2022-02-17 11:11:20 -05:00

View File

@@ -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()