tools/cmake: update to 3.7.0

[openwrt/openwrt.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..6f28c435e018f53fedc3ba840298b6aaf8a07e9b 100644 (file)
--- a/tools/cmake/patches/100-disable_qt_tests.patch
+++ b/tools/cmake/patches/100-disable_qt_tests.patch
@@ -1,26 +1,29 @@
 --- 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)
+@@ -225,15 +225,6 @@ add_RunCMake_test(no_install_prefix)
+ add_RunCMake_test(configure_file)
+ add_RunCMake_test(CTestTimeoutAfterMatch)
  
 -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)
+-  add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
+-endif()
 -
- if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]")
-   add_RunCMake_test(include_external_msproject)
-   add_RunCMake_test(SolutionGlobalSections)
+ find_package(PkgConfig QUIET)
+ if(PKG_CONFIG_FOUND)
+   add_RunCMake_test(FindPkgConfig)
 --- a/Tests/CMakeLists.txt
 +++ b/Tests/CMakeLists.txt
-@@ -259,10 +259,6 @@ if(BUILD_TESTING)
+@@ -393,10 +393,6 @@ if(BUILD_TESTING)
  
    list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
  
 -  if(NOT QT4_FOUND)
--    find_package(Qt4)
+-    find_package(Qt4 QUIET)
 -  endif()
 -
    if(QT4_FOUND)