summaryrefslogtreecommitdiff
path: root/tools/cmake/patches/100-disable_qt_tests.patch
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2016-08-15 11:22:21 +0300
committerJohn Crispin <john@phrozen.org>2016-08-15 15:32:37 +0200
commita247e26a7e3f7562e875c01df02b68cb61920d7d (patch)
tree5bc17bc8a67064a017eee78df20a3fa39693b666 /tools/cmake/patches/100-disable_qt_tests.patch
parent785cdc3cf24fbde6be47d609e1b363c313affca1 (diff)
downloadmtk-20170518-a247e26a7e3f7562e875c01df02b68cb61920d7d.zip
mtk-20170518-a247e26a7e3f7562e875c01df02b68cb61920d7d.tar.gz
mtk-20170518-a247e26a7e3f7562e875c01df02b68cb61920d7d.tar.bz2
tools/cmake: update to 3.6.1
Update cmake to 3.6.1 Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'tools/cmake/patches/100-disable_qt_tests.patch')
-rw-r--r--tools/cmake/patches/100-disable_qt_tests.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch
index 9d2f641..a4c7b7e 100644
--- 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
-@@ -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(CTestTimeoutAfterMatch)
-find_package(Qt4 QUIET)
-find_package(Qt5Core QUIET)
@@ -18,7 +18,7 @@
add_RunCMake_test(FindPkgConfig)
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
-@@ -389,10 +389,6 @@ if(BUILD_TESTING)
+@@ -392,10 +392,6 @@ if(BUILD_TESTING)
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})