From d4540354303949c93b20ea0148afd90ce5e40ea6 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sun, 17 Mar 2019 11:17:28 +0100 Subject: Revert "tools/cmake: Update to 3.14.0" The cmake bump to 3.14.0 breaks build on all targets. Revert it for now. This reverts commit a3446257a8737bfc2899c5911791873561feecc7. Signed-off-by: Stijn Tintel --- tools/cmake/patches/100-disable_qt_tests.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '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 7f83e279f7..af04bf7c41 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 -@@ -325,15 +325,6 @@ add_RunCMake_test(no_install_prefix) +@@ -301,15 +301,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 -@@ -483,13 +483,6 @@ if(BUILD_TESTING) +@@ -437,13 +437,6 @@ if(BUILD_TESTING) list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX}) -- cgit v1.2.3