2013-09-07 18:33:07 +00:00
|
|
|
--- a/Tests/RunCMake/CMakeLists.txt
|
|
|
|
|
+++ b/Tests/RunCMake/CMakeLists.txt
|
2018-01-05 21:30:02 +00:00
|
|
|
@@ -273,15 +273,6 @@ add_RunCMake_test(no_install_prefix)
|
2015-10-31 09:31:06 +00:00
|
|
|
add_RunCMake_test(configure_file)
|
2016-08-15 08:22:21 +00:00
|
|
|
add_RunCMake_test(CTestTimeoutAfterMatch)
|
2013-09-07 18:33:07 +00:00
|
|
|
|
|
|
|
|
-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()
|
2013-10-18 23:38:26 +00:00
|
|
|
-if (QT4_FOUND)
|
2015-10-31 09:31:06 +00:00
|
|
|
- add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
|
2013-10-18 23:38:26 +00:00
|
|
|
-endif()
|
2013-09-07 18:33:07 +00:00
|
|
|
-
|
2015-10-31 09:31:06 +00:00
|
|
|
find_package(PkgConfig QUIET)
|
|
|
|
|
if(PKG_CONFIG_FOUND)
|
|
|
|
|
add_RunCMake_test(FindPkgConfig)
|
2013-09-07 18:33:07 +00:00
|
|
|
--- a/Tests/CMakeLists.txt
|
|
|
|
|
+++ b/Tests/CMakeLists.txt
|
2018-01-05 21:30:02 +00:00
|
|
|
@@ -407,13 +407,6 @@ if(BUILD_TESTING)
|
2013-09-07 18:33:07 +00:00
|
|
|
|
|
|
|
|
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
|
|
|
|
|
|
2018-01-05 21:30:02 +00:00
|
|
|
- if(NOT DEFINED CMake_TEST_Qt4)
|
|
|
|
|
- set(CMake_TEST_Qt4 1)
|
|
|
|
|
- endif()
|
|
|
|
|
- if(CMake_TEST_Qt4 AND NOT QT4_FOUND)
|
2015-10-31 09:31:06 +00:00
|
|
|
- find_package(Qt4 QUIET)
|
2013-09-07 18:33:07 +00:00
|
|
|
- endif()
|
|
|
|
|
-
|
2018-01-05 21:30:02 +00:00
|
|
|
if(CMake_TEST_Qt4 AND QT4_FOUND)
|
2013-09-07 18:33:07 +00:00
|
|
|
# test whether the Qt4 which has been found works, on some machines
|
|
|
|
|
# which run nightly builds there were errors like "wrong file format"
|
