kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmp0054-warnings-extproj' 

a300d0ff ExternalProject: avoid CMP0054 warnings
This commit is contained in:
Brad King 2014-12-15 11:06:57 -05:00 committed by CMake Topic Stage
parent b9e0babea9 a300d0ff0f
commit 1b3ab3318d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/ExternalProject.cmake
View File

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