cmake: upgrade to 2.8.12

[openwrt/staging/mkresin.git] / tools / cmake / patches / 100-disable_qt_tests.patch

diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch
index 26ad89c2f1741c8e1f3e3980c9e27774afdb288c..3d44dac53f27c5cf2b1c1c03689255c0825a65b9 100644 (file)
--- a/tools/cmake/patches/100-disable_qt_tests.patch
+++ b/tools/cmake/patches/100-disable_qt_tests.patch
@@ -1,21 +1,25 @@
 --- a/Tests/RunCMake/CMakeLists.txt
 +++ b/Tests/RunCMake/CMakeLists.txt
-@@ -76,12 +76,6 @@ add_RunCMake_test(include_directories)
- add_RunCMake_test(list)
- add_RunCMake_test(CMP0004)
+@@ -101,16 +101,6 @@
+ add_RunCMake_test(TargetPolicies)
+ add_RunCMake_test(alias_targets)
  
 -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)
+-  set(ObsoleteQtMacros_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
+-  add_RunCMake_test(ObsoleteQtMacros)
+-endif()
 -
  if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]")
    add_RunCMake_test(include_external_msproject)
    add_RunCMake_test(SolutionGlobalSections)
 --- a/Tests/CMakeLists.txt
 +++ b/Tests/CMakeLists.txt
-@@ -259,10 +259,6 @@ if(BUILD_TESTING)
+@@ -262,10 +262,6 @@
  
    list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})