| 12345678910111213141516171819202122232425262728293031323334 |
- --- a/Tests/RunCMake/CMakeLists.txt
- +++ b/Tests/RunCMake/CMakeLists.txt
- @@ -290,15 +290,6 @@ add_RunCMake_test(no_install_prefix)
- add_RunCMake_test(configure_file)
- add_RunCMake_test(CTestTimeoutAfterMatch)
-
- -find_package(Qt4 QUIET)
- -find_package(Qt5Core QUIET)
- -if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
- - add_RunCMake_test(IncompatibleQt)
- -endif()
- -if (QT4_FOUND)
- - add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
- -endif()
- -
- find_package(PkgConfig QUIET)
- if(PKG_CONFIG_FOUND)
- add_RunCMake_test(FindPkgConfig)
- --- a/Tests/CMakeLists.txt
- +++ b/Tests/CMakeLists.txt
- @@ -435,13 +435,6 @@ if(BUILD_TESTING)
-
- list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
-
- - if(NOT DEFINED CMake_TEST_Qt4)
- - set(CMake_TEST_Qt4 1)
- - endif()
- - if(CMake_TEST_Qt4 AND NOT QT4_FOUND)
- - find_package(Qt4 QUIET)
- - endif()
- -
- if(CMake_TEST_Qt4 AND QT4_FOUND)
- # test whether the Qt4 which has been found works, on some machines
- # which run nightly builds there were errors like "wrong file format"
|
