diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-09-07 18:33:07 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-07 18:33:07 +0000 |
| commit | 7467c1380b0aa1d287b9cecacab7351a65696da8 (patch) | |
| tree | 4460e7b66b0a6149602df3a3fd7e49770ed0a5d9 /tools/cmake/patches/100-disable_qt_tests.patch | |
| parent | 38306e8863eadf7e94e97c0cc339fd6947183147 (diff) | |
| download | upstream-7467c1380b0aa1d287b9cecacab7351a65696da8.tar.gz upstream-7467c1380b0aa1d287b9cecacab7351a65696da8.tar.bz2 upstream-7467c1380b0aa1d287b9cecacab7351a65696da8.zip | |
tools/cmake: disable qt related checks to fix build issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37917 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/cmake/patches/100-disable_qt_tests.patch')
| -rw-r--r-- | tools/cmake/patches/100-disable_qt_tests.patch | 28 |
1 files changed, 28 insertions, 0 deletions
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" |