This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, master has been updated via f2c651aec9782e5913db7ad21b88d2dcde5c359d (commit) via cd7fad9cf36af521191f59cc3a9fcf6916703ca8 (commit) via 7eb701d98b68768ffefc2f219896602368ea414a (commit) via b872f5b303efab154d740168fe9dd995850559d2 (commit) via a353d10a7549be2e40977cf239058902e5baf2d8 (commit) via 7c32432a8088298c6c7d8e40fb095fafc1f107c1 (commit) via 3599b314745aeb7abb109737536f573c2c310f6a (commit) from 0723eada4dcdb4332a63c56e1df6160f19cb9ff5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2c651aec9782e5913db7ad21b88d2dcde5c359d commit f2c651aec9782e5913db7ad21b88d2dcde5c359d Merge: cd7fad9 b872f5b Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Jul 11 11:22:25 2018 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Jul 11 07:22:35 2018 -0400 Merge topic 'file-STRINGS-isprint' b872f5b303 file(STRINGS): Use isprint() to test character type Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !2198 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd7fad9cf36af521191f59cc3a9fcf6916703ca8 commit cd7fad9cf36af521191f59cc3a9fcf6916703ca8 Merge: 7eb701d a353d10 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Jul 11 11:21:44 2018 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Jul 11 07:22:05 2018 -0400 Merge topic 'implicit-link-CMP0054' a353d10a75 Protect implicit link library extraction with policy CMP0054 Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !2201 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7eb701d98b68768ffefc2f219896602368ea414a commit 7eb701d98b68768ffefc2f219896602368ea414a Merge: 0723ead 7c32432 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Jul 11 11:21:31 2018 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Jul 11 07:21:37 2018 -0400 Merge topic 'update-kwsys' 7c32432a80 Merge branch 'upstream-KWSys' into update-kwsys 3599b31474 KWSys 2018-07-10 (51982681) Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !2200 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b872f5b303efab154d740168fe9dd995850559d2 commit b872f5b303efab154d740168fe9dd995850559d2 Author: Devin Nakamura <dev...@ca.ibm.com> AuthorDate: Mon Jul 9 14:39:25 2018 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Jul 10 13:57:07 2018 -0400 file(STRINGS): Use isprint() to test character type Use the more portable `isprint()` function to test characters rather than using hard-coded hex values. The function is documented by the C++ standard to return non-zero for the exact range of hex values we previously hard-coded, so this should not change behavior. diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index e39630e..4c288f5 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -10,6 +10,7 @@ #include <algorithm> #include <assert.h> +#include <ctype.h> #include <memory> // IWYU pragma: keep #include <sstream> #include <stdio.h> @@ -609,8 +610,8 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args) continue; } - if ((c >= 0x20 && c < 0x7F) || c == '\t' || - (c == '\n' && newline_consume)) { + if (c >= 0 && c <= 0xFF && + (isprint(c) || c == '\t' || (c == '\n' && newline_consume))) { // This is an ASCII character that may be part of a string. // Cast added to avoid compiler warning. Cast is ok because // c is guaranteed to fit in char by the above if... https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a353d10a7549be2e40977cf239058902e5baf2d8 commit a353d10a7549be2e40977cf239058902e5baf2d8 Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Jul 10 09:25:10 2018 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Jul 10 09:31:24 2018 -0400 Protect implicit link library extraction with policy CMP0054 CMakeParseImplicitLinkInfo tests arbitrary content with `if(MATCHES)`. Set policy CMP0054 to ensure the line content is never interpreted as a variable reference (which may also produce a CMP0054 warning). While at it, also set policy CMP0053 to improve performance. diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake index 935f92d..30659eb 100644 --- a/Modules/CMakeParseImplicitLinkInfo.cmake +++ b/Modules/CMakeParseImplicitLinkInfo.cmake @@ -1,6 +1,9 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. +cmake_policy(PUSH) +cmake_policy(SET CMP0053 NEW) +cmake_policy(SET CMP0054 NEW) # Function parse implicit linker options. # This is used internally by CMake and should not be included by user @@ -185,3 +188,5 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj set(${fwk_var} "${implicit_fwks}" PARENT_SCOPE) set(${log_var} "${log}" PARENT_SCOPE) endfunction() + +cmake_policy(POP) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c32432a8088298c6c7d8e40fb095fafc1f107c1 commit 7c32432a8088298c6c7d8e40fb095fafc1f107c1 Merge: be69317 3599b31 Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Jul 10 08:46:37 2018 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Jul 10 08:46:37 2018 -0400 Merge branch 'upstream-KWSys' into update-kwsys * upstream-KWSys: KWSys 2018-07-10 (51982681) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3599b314745aeb7abb109737536f573c2c310f6a commit 3599b314745aeb7abb109737536f573c2c310f6a Author: KWSys Upstream <kwro...@kitware.com> AuthorDate: Tue Jul 10 08:37:49 2018 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Jul 10 08:46:35 2018 -0400 KWSys 2018-07-10 (51982681) Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 5198268138295f67c567c04f4cb0c0f3fdfebef4 (master). Upstream Shortlog ----------------- Brad King (1): aebe4597 XL: Restore suppression of infinite loop warning in process test diff --git a/CMakeLists.txt b/CMakeLists.txt index 96088c8..516104b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1193,13 +1193,17 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) # Some Apple compilers produce bad optimizations in this source. IF(APPLE AND CMAKE_C_COMPILER_ID MATCHES "^(GNU|LLVM)$") SET(testProcess_COMPILE_FLAGS "${testProcess_COMPILE_FLAGS} -O0") - ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "XL" AND - NOT (CMAKE_SYSTEM MATCHES "Linux.*ppc64le" AND - NOT CMAKE_C_COMPILER_VERSION VERSION_LESS "13.1.1")) + ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "XL") # Tell IBM XL not to warn about our test infinite loop - # v13.1.1 and newer on Linux ppc64le is clang based and does not accept - # the -qsuppress option - SET(testProcess_COMPILE_FLAGS "${testProcess_COMPILE_FLAGS} -qsuppress=1500-010") + IF(CMAKE_SYSTEM MATCHES "Linux.*ppc64le" + AND CMAKE_C_COMPILER_VERSION VERSION_LESS "16.1.0" + AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS "13.1.1") + # v13.1.[1-6] on Linux ppc64le is clang based and does not accept + # the -qsuppress option, so just suppress all warnings. + SET(testProcess_COMPILE_FLAGS "${testProcess_COMPILE_FLAGS} -w") + ELSE() + SET(testProcess_COMPILE_FLAGS "${testProcess_COMPILE_FLAGS} -qsuppress=1500-010") + ENDIF() ENDIF() IF(CMAKE_C_FLAGS MATCHES "-fsanitize=") SET(testProcess_COMPILE_FLAGS "${testProcess_COMPILE_FLAGS} -DCRASH_USING_ABORT") ----------------------------------------------------------------------- Summary of changes: Modules/CMakeParseImplicitLinkInfo.cmake | 5 +++++ Source/cmFileCommand.cxx | 5 +++-- Source/kwsys/CMakeLists.txt | 16 ++++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits