diff options
| author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2019-03-16 21:09:22 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-09-04 13:46:12 +0200 |
| commit | 32d27a9017b8e9bad50bab085dd0cc3fc5a83e03 (patch) | |
| tree | a59df3069454d61757132c6fd9f35bf78157810a /tools/cmake/patches/150-C-feature-checks-Match-warnings-more-strictly.patch | |
| parent | 6b5e0eede81f8a2518a3a5bef5be302b26d149bc (diff) | |
| download | upstream-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/150-C-feature-checks-Match-warnings-more-strictly.patch')
| -rw-r--r-- | tools/cmake/patches/150-C-feature-checks-Match-warnings-more-strictly.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/tools/cmake/patches/150-C-feature-checks-Match-warnings-more-strictly.patch b/tools/cmake/patches/150-C-feature-checks-Match-warnings-more-strictly.patch deleted file mode 100644 index 674ff0d392..0000000000 --- a/tools/cmake/patches/150-C-feature-checks-Match-warnings-more-strictly.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4ca5a815f2dfe9e1116cc2ccd5ddb56d0d00d12e Mon Sep 17 00:00:00 2001 -From: Brad King <brad.king@kitware.com> -Date: Thu, 7 Mar 2019 14:55:54 -0500 -Subject: [PATCH] C++ feature checks: Match warnings more strictly - -Require the word "warning" to appear at the start of a line, after -whitespace, or after a `:`. This is the same that CTest launchers use -to match warnings. It avoids matching "warning" inside file paths. - -Fixes: #19019 ---- - Source/Checks/cm_cxx_features.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/Source/Checks/cm_cxx_features.cmake -+++ b/Source/Checks/cm_cxx_features.cmake -@@ -25,7 +25,7 @@ function(cm_check_cxx_feature name) - # Filter out xcodebuild warnings. - string(REGEX REPLACE "[^\n]* xcodebuild\\[[0-9]*:[0-9]*\\] warning: [^\n]*" "" check_output "${check_output}") - # If using the feature causes warnings, treat it as broken/unavailable. -- if(check_output MATCHES "[Ww]arning") -+ if(check_output MATCHES "(^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]") - set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE) - endif() - if(CMake_HAVE_CXX_${FEATURE}) |