projects
/
openwrt
/
openwrt.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.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 deaa5ae48cf0e804fa570e5fd67fe73277d58ce4..6f28c435e018f53fedc3ba840298b6aaf8a07e9b 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
-@@ -160,15 +160,6 @@
- add_RunCMake_test(no_install_prefix)
+@@ -225,15 +225,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
58,10 +358,6 @@
+@@ -3
93,10 +393,6 @@ if(BUILD_TESTING)
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})