diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-15 16:06:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-12-15 16:06:57 (GMT) |
| commit | 1b3ab3318dcdabe074da3c95b54f9483d47f95be (patch) | |
| tree | 1ec3a297822a477f318cf60586422dcf1d9636ef /Modules/ExternalProject.cmake | |
| parent | b9e0babea92829e622eab9415ea64e43ec41bacf (diff) | |
| parent | a300d0ff0fbec17360113f9bb1c09e9efab19792 (diff) | |
| download | CMake-1b3ab3318dcdabe074da3c95b54f9483d47f95be.zip CMake-1b3ab3318dcdabe074da3c95b54f9483d47f95be.tar.gz CMake-1b3ab3318dcdabe074da3c95b54f9483d47f95be.tar.bz2 | |
Merge topic 'cmp0054-warnings-extproj'
a300d0ff ExternalProject: avoid CMP0054 warnings
Diffstat (limited to 'Modules/ExternalProject.cmake')
| -rw-r--r-- | Modules/ExternalProject.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 98ff716..52d41eb 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) |