projects
/
openwrt-github
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools/cmake: update to 3.6.1
[openwrt-github/.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 9d2f641041e3328f7c4da11cee16bf5b7cd7b730..a4c7b7e79594e3cc6c45b1900abfdfd3abd1ba64 100644
(file)
--- a/
tools/cmake/patches/100-disable_qt_tests.patch
+++ b/
tools/cmake/patches/100-disable_qt_tests.patch
@@
-1,8
+1,8
@@
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
-@@ -217,15 +217,6 @@ add_RunCMake_test(interface_library)
- add_RunCMake_test(no_install_prefix)
+@@ -219,15 +219,6 @@ add_RunCMake_test(no_install_prefix)
add_RunCMake_test(configure_file)
add_RunCMake_test(configure_file)
+ add_RunCMake_test(CTestTimeoutAfterMatch)
-find_package(Qt4 QUIET)
-find_package(Qt5Core QUIET)
-find_package(Qt4 QUIET)
-find_package(Qt5Core QUIET)
@@
-18,7
+18,7
@@
add_RunCMake_test(FindPkgConfig)
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
add_RunCMake_test(FindPkgConfig)
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
-@@ -3
89,10 +389
,6 @@ if(BUILD_TESTING)
+@@ -3
92,10 +392
,6 @@ if(BUILD_TESTING)
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})