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 | f39f07cd09c6b4cdfba71d006ad82ba71bd31328 (patch) | |
| tree | 7ba4d64f7ccdfd475474ddc09508a228bac0f665 /tools | |
| parent | f181b07af85568755148e1948cfe9fcb6bd89b9c (diff) | |
| download | upstream-f39f07cd09c6b4cdfba71d006ad82ba71bd31328.tar.gz upstream-f39f07cd09c6b4cdfba71d006ad82ba71bd31328.tar.bz2 upstream-f39f07cd09c6b4cdfba71d006ad82ba71bd31328.zip | |
tools/cmake: disable qt related checks to fix build issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37917
Diffstat (limited to 'tools')
| -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" |