From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 7 Sep 2013 18:33:07 +0000 (+0000)
Subject: tools/cmake: disable qt related checks to fix build issues
X-Git-Tag: reboot~9365
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f39f07cd09c6b4cdfba71d006ad82ba71bd31328;p=openwrt%2Fstaging%2Fnoltari.git

tools/cmake: disable qt related checks to fix build issues

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37917
---

diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch
new file mode 100644
index 0000000000..26ad89c2f1
--- /dev/null
+++ b/tools/cmake/patches/100-disable_qt_tests.patch
@@ -0,0 +1,28 @@
+--- 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)
+ 
+-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("${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)
+ 
+   list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
+ 
+-  if(NOT QT4_FOUND)
+-    find_package(Qt4)
+-  endif()
+-
+   if(QT4_FOUND)
+     # test whether the Qt4 which has been found works, on some machines
+     # which run nightly builds there were errors like "wrong file format"