[Cmake-commits] CMake branch, master, updated. v3.9.0-rc4-148-ga52ecd9
Kitware Robot
kwrobot at kitware.com
Mon Jun 26 10:45:05 EDT 2017
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 a52ecd983ff612becff90bba65e30ddf98d28c7f (commit)
via b93a69e6d1d6f192fd106ae2aafa96c29533e2a8 (commit)
via 23451a66acc9762f27ab93cb4fe2192b2fb3fbfc (commit)
via 04b2fc08b44f7db5fe591b0ee244c5dfe9134d68 (commit)
from 581fda598cc4132519c5abdcd566cab42269ad1f (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=a52ecd983ff612becff90bba65e30ddf98d28c7f
commit a52ecd983ff612becff90bba65e30ddf98d28c7f
Merge: b93a69e 04b2fc0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 26 14:42:33 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jun 26 10:42:36 2017 -0400
Merge topic 'toolchain-binutils-advanced'
04b2fc08 GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advanced
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1001
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b93a69e6d1d6f192fd106ae2aafa96c29533e2a8
commit b93a69e6d1d6f192fd106ae2aafa96c29533e2a8
Merge: 581fda5 23451a6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 26 14:42:06 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jun 26 10:42:10 2017 -0400
Merge topic 'GetPrerequisites-ucrt-no-warn'
23451a66 GetPrerequisites: Do not warn about non-absolute UCRT system libraries
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !999
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23451a66acc9762f27ab93cb4fe2192b2fb3fbfc
commit 23451a66acc9762f27ab93cb4fe2192b2fb3fbfc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 22 10:58:24 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 26 10:33:16 2017 -0400
GetPrerequisites: Do not warn about non-absolute UCRT system libraries
Issue: #17007
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 0090cdc..4e52cb3 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -609,7 +609,7 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
if(NOT is_embedded)
if(NOT IS_ABSOLUTE "${resolved_file}")
- if(lower MATCHES "^msvc[^/]+dll" AND is_system)
+ if(lower MATCHES "^(msvc|api-ms-win-)[^/]+dll" AND is_system)
message(STATUS "info: non-absolute msvc file '${file}' returning type '${type}'")
else()
message(STATUS "warning: gp_resolved_file_type non-absolute file '${file}' returning type '${type}' -- possibly incorrect")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04b2fc08b44f7db5fe591b0ee244c5dfe9134d68
commit 04b2fc08b44f7db5fe591b0ee244c5dfe9134d68
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 22 11:10:19 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 22 11:33:54 2017 -0400
GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advanced
diff --git a/Modules/Compiler/Clang-FindBinUtils.cmake b/Modules/Compiler/Clang-FindBinUtils.cmake
index c81e77a..e2822a1 100644
--- a/Modules/Compiler/Clang-FindBinUtils.cmake
+++ b/Modules/Compiler/Clang-FindBinUtils.cmake
@@ -16,6 +16,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR NAMES
HINTS ${__clang_hints}
DOC "LLVM archiver"
)
+mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR)
# http://manpages.ubuntu.com/manpages/precise/en/man1/llvm-ranlib.1.html
find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB NAMES
@@ -23,3 +24,4 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB NAMES
HINTS ${__clang_hints}
DOC "Generate index for LLVM archive"
)
+mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB)
diff --git a/Modules/Compiler/GNU-FindBinUtils.cmake b/Modules/Compiler/GNU-FindBinUtils.cmake
index 142636c..16b7bbd 100644
--- a/Modules/Compiler/GNU-FindBinUtils.cmake
+++ b/Modules/Compiler/GNU-FindBinUtils.cmake
@@ -22,6 +22,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR NAMES
HINTS ${__gcc_hints}
DOC "A wrapper around 'ar' adding the appropriate '--plugin' option for the GCC compiler"
)
+mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR)
# http://manpages.ubuntu.com/manpages/wily/en/man1/gcc-ranlib.1.html
find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB NAMES
@@ -31,3 +32,4 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB NAMES
HINTS ${__gcc_hints}
DOC "A wrapper around 'ranlib' adding the appropriate '--plugin' option for the GCC compiler"
)
+mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB)
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/Clang-FindBinUtils.cmake | 2 ++
Modules/Compiler/GNU-FindBinUtils.cmake | 2 ++
Modules/GetPrerequisites.cmake | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list