diff options
| author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2019-03-16 21:09:22 +0000 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2019-03-16 22:01:59 +0100 |
| commit | a3446257a8737bfc2899c5911791873561feecc7 (patch) | |
| tree | 5d3f5b9f647b4609e0c54fa42214c48b62c97f98 /tools/cmake/patches | |
| parent | dd3214f95d3557fc4c8dc794620149f4e3f4d2e8 (diff) | |
| download | upstream-a3446257a8737bfc2899c5911791873561feecc7.tar.gz upstream-a3446257a8737bfc2899c5911791873561feecc7.tar.bz2 upstream-a3446257a8737bfc2899c5911791873561feecc7.zip | |
tools/cmake: Update to 3.14.0
Update CMake to 3.14.0
Refresh patches
Remove inofficial fossies.org and replace with GitHub (link on official site)
Remote 150-C-feature-checks-Match-warnings-more-strictly.patch as it's
a no longer needed backport from upstream.
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'tools/cmake/patches')
4 files changed, 4 insertions, 29 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}) diff --git a/tools/cmake/patches/120-curl-fix-libressl-linking.patch b/tools/cmake/patches/120-curl-fix-libressl-linking.patch index e217979ee4..e7d9c5ddda 100644 --- a/tools/cmake/patches/120-curl-fix-libressl-linking.patch +++ b/tools/cmake/patches/120-curl-fix-libressl-linking.patch @@ -20,7 +20,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io> --- --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt -@@ -454,6 +454,14 @@ if(CMAKE_USE_OPENSSL) +@@ -453,6 +453,14 @@ if(CMAKE_USE_OPENSSL) set(USE_OPENSSL ON) set(HAVE_LIBCRYPTO ON) set(HAVE_LIBSSL ON) diff --git a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch index 535417d55a..124cf6d9d4 100644 --- a/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch +++ b/tools/cmake/patches/130-bootstrap_parallel_make_flag.patch @@ -1,6 +1,6 @@ --- a/bootstrap +++ b/bootstrap -@@ -1164,7 +1164,10 @@ int main(){ printf("1%c", (char)0x0a); r +@@ -1168,7 +1168,10 @@ int main(){ printf("1%c", (char)0x0a); r ' > "test.c" cmake_original_make_flags="${cmake_make_flags}" if [ "x${cmake_parallel_make}" != "x" ]; then 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}) |