[tools] cmake: upgrade to 2.8.12
[openwrt.git] / tools / cmake / patches / 100-disable_qt_tests.patch
1 --- a/Tests/RunCMake/CMakeLists.txt
2 +++ b/Tests/RunCMake/CMakeLists.txt
3 @@ -101,16 +101,6 @@
4  add_RunCMake_test(TargetPolicies)
5  add_RunCMake_test(alias_targets)
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 -  set(ObsoleteQtMacros_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
14 -  add_RunCMake_test(ObsoleteQtMacros)
15 -endif()
16 -
17  if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]")
18    add_RunCMake_test(include_external_msproject)
19    add_RunCMake_test(SolutionGlobalSections)
20 --- a/Tests/CMakeLists.txt
21 +++ b/Tests/CMakeLists.txt
22 @@ -262,10 +262,6 @@
23  
24    list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
25  
26 -  if(NOT QT4_FOUND)
27 -    find_package(Qt4)
28 -  endif()
29 -
30    if(QT4_FOUND)
31      # test whether the Qt4 which has been found works, on some machines
32      # which run nightly builds there were errors like "wrong file format"