v1.5 branch refresh based upon upstream master @ c8677ca89e53e3be7988d54280fce166cc894a7e
[librecmc/librecmc.git] / tools / cmake / patches / 100-disable_qt_tests.patch
1 --- a/Tests/RunCMake/CMakeLists.txt
2 +++ b/Tests/RunCMake/CMakeLists.txt
3 @@ -284,15 +284,6 @@ add_RunCMake_test(no_install_prefix)
4  add_RunCMake_test(configure_file)
5  add_RunCMake_test(CTestTimeoutAfterMatch)
6  
7 -find_package(Qt4 QUIET)
8 -find_package(Qt5Core QUIET)
9 -if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
10 -  add_RunCMake_test(IncompatibleQt)
11 -endif()
12 -if (QT4_FOUND)
13 -  add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
14 -endif()
15 -
16  find_package(PkgConfig QUIET)
17  if(PKG_CONFIG_FOUND)
18    add_RunCMake_test(FindPkgConfig)
19 --- a/Tests/CMakeLists.txt
20 +++ b/Tests/CMakeLists.txt
21 @@ -422,13 +422,6 @@ if(BUILD_TESTING)
22  
23    list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
24  
25 -  if(NOT DEFINED CMake_TEST_Qt4)
26 -    set(CMake_TEST_Qt4 1)
27 -  endif()
28 -  if(CMake_TEST_Qt4 AND NOT QT4_FOUND)
29 -    find_package(Qt4 QUIET)
30 -  endif()
31 -
32    if(CMake_TEST_Qt4 AND QT4_FOUND)
33      # test whether the Qt4 which has been found works, on some machines
34      # which run nightly builds there were errors like "wrong file format"