aboutsummaryrefslogtreecommitdiffstats
path: root/tools/cmake/patches/100-disable_qt_tests.patch
diff options
context:
space:
mode:
authorDaniel Engberg <daniel.engberg.lists@pyret.net>2019-03-16 21:09:22 +0000
committerJo-Philipp Wich <jo@mein.io>2019-09-04 13:46:12 +0200
commit32d27a9017b8e9bad50bab085dd0cc3fc5a83e03 (patch)
treea59df3069454d61757132c6fd9f35bf78157810a /tools/cmake/patches/100-disable_qt_tests.patch
parent6b5e0eede81f8a2518a3a5bef5be302b26d149bc (diff)
downloadupstream-32d27a9017b8e9bad50bab085dd0cc3fc5a83e03.tar.gz
upstream-32d27a9017b8e9bad50bab085dd0cc3fc5a83e03.tar.bz2
upstream-32d27a9017b8e9bad50bab085dd0cc3fc5a83e03.zip
tools/cmake: Update to 3.15.1
Update CMake to 3.15.1 Refresh patches Remove inofficial fossies.org and replace with GitHub (link on official site) Remove 150-C-feature-checks-Match-warnings-more-strictly.patch as it's a no longer needed backport from upstream. Disable ccache if GCC is 4.8, 4.9 or 5.X to avoid build failures. Reference: https://github.com/openwrt/openwrt/pull/1929 Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net> (cherry picked from commit 413c68d120043cd8ff1f4aa057d33c140bfc6bfa)
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 af04bf7c41..7f83e279f7 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
-@@ -301,15 +301,6 @@ add_RunCMake_test(no_install_prefix)
+@@ -325,15 +325,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
-@@ -437,13 +437,6 @@ if(BUILD_TESTING)
+@@ -483,13 +483,6 @@ if(BUILD_TESTING)
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})