[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-414-g3d21e5a

[Brad King]

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, next has been updated
       via  3d21e5a7192f03d66bfc9962ec7b7017303daea2 (commit)
       via  d1cf09e3c2ded58d08288a42c0eb9038727c22c7 (commit)
      from  11fb11ab1de4f238e89b7836a54b97a10291b4a1 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d21e5a7192f03d66bfc9962ec7b7017303daea2
commit 3d21e5a7192f03d66bfc9962ec7b7017303daea2
Merge: 11fb11a d1cf09e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:33:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 12:33:07 2015 -0500

    Merge topic 'CMakeParseImplicitLinkInfo-CMP0054' into next
    
    d1cf09e3 CMakeParseImplicitLinkInfo: Avoid if() auto-deref in quoted arg


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1cf09e3c2ded58d08288a42c0eb9038727c22c7
commit d1cf09e3c2ded58d08288a42c0eb9038727c22c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:30:59 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 12:32:47 2015 -0500

    CMakeParseImplicitLinkInfo: Avoid if() auto-deref in quoted arg
    
    When matching implicit library names, use a sentinel "x" to avoid
    ever expanding the library name as a variable.  This was detected
    by a CMP0054 warning.

diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake
index fcc13da..8abc465 100644
--- a/Modules/CMakeParseImplicitLinkInfo.cmake
+++ b/Modules/CMakeParseImplicitLinkInfo.cmake
@@ -124,7 +124,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
   # We remove items that are not language-specific.
   set(implicit_libs "")
   foreach(lib IN LISTS implicit_libs_tmp)
-    if("${lib}" MATCHES "^(crt.*\\.o|gcc.*|System.*)$")
+    if("x${lib}" MATCHES "^x(crt.*\\.o|gcc.*|System.*)$")
       set(log "${log}  remove lib [${lib}]\n")
     elseif(IS_ABSOLUTE "${lib}")
       get_filename_component(abs "${lib}" ABSOLUTE)

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeParseImplicitLinkInfo.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake