From a300d0ff0fbec17360113f9bb1c09e9efab19792 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 12 Dec 2014 18:30:00 -0500 Subject: [PATCH] ExternalProject: avoid CMP0054 warnings Found where ${command} is "make" which is a local variable. --- Modules/ExternalProject.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 7e4cc373b..a11055b53 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)