summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <mathstuf@gmail.com>2014-12-12 23:30:00 (GMT)
committerBen Boeckel <mathstuf@gmail.com>2014-12-12 23:30:00 (GMT)
commita300d0ff0fbec17360113f9bb1c09e9efab19792 (patch)
tree74819e8754ffc0150bc59ab62958430d3859d05b
parenta829f09bdd5cf28c59eeebd39d1652be2bd23283 (diff)
downloadCMake-a300d0ff0fbec17360113f9bb1c09e9efab19792.zip
CMake-a300d0ff0fbec17360113f9bb1c09e9efab19792.tar.gz
CMake-a300d0ff0fbec17360113f9bb1c09e9efab19792.tar.bz2
ExternalProject: avoid CMP0054 warnings
Found where ${command} is "make" which is a local variable.
-rw-r--r--Modules/ExternalProject.cmake4
1 files changed, 2 insertions, 2 deletions
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)