100-disable_qt_tests.patch 982 B

12345678910111213141516171819202122232425262728293031
  1. --- a/Tests/RunCMake/CMakeLists.txt
  2. +++ b/Tests/RunCMake/CMakeLists.txt
  3. @@ -225,15 +225,6 @@ add_RunCMake_test(no_install_prefix)
  4. add_RunCMake_test(configure_file)
  5. add_RunCMake_test(CTestTimeoutAfterMatch)
  6. -find_package(Qt4 QUIET)
  7. -find_package(Qt5Core QUIET)
  8. -if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
  9. - add_RunCMake_test(IncompatibleQt)
  10. -endif()
  11. -if (QT4_FOUND)
  12. - add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
  13. -endif()
  14. -
  15. find_package(PkgConfig QUIET)
  16. if(PKG_CONFIG_FOUND)
  17. add_RunCMake_test(FindPkgConfig)
  18. --- a/Tests/CMakeLists.txt
  19. +++ b/Tests/CMakeLists.txt
  20. @@ -393,10 +393,6 @@ if(BUILD_TESTING)
  21. list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
  22. - if(NOT QT4_FOUND)
  23. - find_package(Qt4 QUIET)
  24. - endif()
  25. -
  26. if(QT4_FOUND)
  27. # test whether the Qt4 which has been found works, on some machines
  28. # which run nightly builds there were errors like "wrong file format"