[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1157-gd42fb10

[Ben Boeckel]

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  d42fb107b932f29001ba2ac362c2fee319c8c55a (commit)
       via  a300d0ff0fbec17360113f9bb1c09e9efab19792 (commit)
      from  0154b576c4d9bcf98d0ee3964110cd684ba95241 (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=d42fb107b932f29001ba2ac362c2fee319c8c55a
commit d42fb107b932f29001ba2ac362c2fee319c8c55a
Merge: 0154b57 a300d0f
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Dec 12 18:35:48 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 12 18:35:48 2014 -0500

    Merge topic 'cmp0054-warnings-extproj' into next
    
    a300d0ff ExternalProject: avoid CMP0054 warnings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a300d0ff0fbec17360113f9bb1c09e9efab19792
commit a300d0ff0fbec17360113f9bb1c09e9efab19792
Author:     Ben Boeckel <mathstuf at gmail.com>
AuthorDate: Fri Dec 12 18:30:00 2014 -0500
Commit:     Ben Boeckel <mathstuf at gmail.com>
CommitDate: Fri Dec 12 18:30:00 2014 -0500

    ExternalProject: avoid CMP0054 warnings
    
    Found where ${command} is "make" which is a local variable.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 7e4cc37..a11055b 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1241,7 +1241,7 @@ function(_ep_write_log_script name step cmd_var)
 
   set(make "")
   set(code_cygpath_make "")
-  if("${command}" MATCHES "^\\$\\(MAKE\\)")
+  if(command MATCHES "^\\$\\(MAKE\\)")
     # GNU make recognizes the string "$(MAKE)" as recursive make, so
     # ensure that it appears directly in the makefile.
     string(REGEX REPLACE "^\\$\\(MAKE\\)" "\${make}" command "${command}")
@@ -1273,7 +1273,7 @@ endif()
 
   # Wrap multiple 'COMMAND' lines up into a second-level wrapper
   # script so all output can be sent to one log file.
-  if("${command}" MATCHES ";COMMAND;")
+  if(command MATCHES ";COMMAND;")
     set(code_execute_process "
 ${code_cygpath_make}
 execute_process(COMMAND \${command} RESULT_VARIABLE result)

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

Summary of changes:
 Modules/ExternalProject.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake