aboutsummaryrefslogtreecommitdiffstats
path: root/tools/cmake/patches/100-disable_qt_tests.patch
diff options
context:
space:
mode:
authorDaniel Engberg <daniel.engberg.lists@pyret.net>2018-07-22 18:31:38 +0200
committerHans Dedecker <dedeckeh@gmail.com>2018-07-29 10:08:20 +0200
commitb078229412e37ccf9ca8d9a437af6b8861bd2dbb (patch)
tree47c4b73fea2b1089537064e857d0673ffad8159d /tools/cmake/patches/100-disable_qt_tests.patch
parenta07730472c49c1f7bb56afa3eb8be23e6e87b4f1 (diff)
downloadupstream-b078229412e37ccf9ca8d9a437af6b8861bd2dbb.tar.gz
upstream-b078229412e37ccf9ca8d9a437af6b8861bd2dbb.tar.bz2
upstream-b078229412e37ccf9ca8d9a437af6b8861bd2dbb.zip
tools/cmake: Update to 3.12.0
Update cmake to 3.12.0 Remove 140-curl-fix-libressl.patch as fix is in upstream Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'tools/cmake/patches/100-disable_qt_tests.patch')
-rw-r--r--tools/cmake/patches/100-disable_qt_tests.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch
index 46cdc94563..262360d287 100644
--- a/tools/cmake/patches/100-disable_qt_tests.patch
+++ b/tools/cmake/patches/100-disable_qt_tests.patch
@@ -1,6 +1,6 @@
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
-@@ -284,15 +284,6 @@ add_RunCMake_test(no_install_prefix)
+@@ -289,15 +289,6 @@ add_RunCMake_test(no_install_prefix)
add_RunCMake_test(configure_file)
add_RunCMake_test(CTestTimeoutAfterMatch)
@@ -18,7 +18,7 @@
add_RunCMake_test(FindPkgConfig)
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
-@@ -422,13 +422,6 @@ if(BUILD_TESTING)
+@@ -435,13 +435,6 @@ if(BUILD_TESTING)
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})