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

Merge topic 'ExternalProject-cygwin-make' 

ed43ea6 ExternalProject: Fix $(MAKE) with cygpath on Windows
This commit is contained in:
Brad King 2010-08-03 16:21:55 -04:00 committed by CMake Topic Stage
parent a1b9388bc3 ed43ea603f
commit 7e578b8d73
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/ExternalProject.cmake
View File

@ -613,11 +613,29 @@ function(_ep_write_log_script name step cmd_var)
set(command "${${cmd_var}}") set(command "${${cmd_var}}")
set(make "") set(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}")
set(make "-Dmake=$(MAKE)") set(make "-Dmake=$(MAKE)")
if(WIN32 AND NOT CYGWIN)
set(code_cygpath_make "
if(\${make} MATCHES \"^/\")
execute_process(
COMMAND cygpath -w \${make}
OUTPUT_VARIABLE cygpath_make
ERROR_VARIABLE cygpath_make
RESULT_VARIABLE cygpath_error
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(NOT cygpath_error)
set(make \${cygpath_make})
endif()
endif()
")
endif()
endif() endif()
set(config "") set(config "")
@ -630,6 +648,7 @@ function(_ep_write_log_script name step cmd_var)
# 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}
execute_process(COMMAND \${command} RESULT_VARIABLE result) execute_process(COMMAND \${command} RESULT_VARIABLE result)
if(result) if(result)
set(msg \"Command failed (\${result}):\\n\") set(msg \"Command failed (\${result}):\\n\")
@ -661,6 +680,7 @@ endif()
set(script ${stamp_dir}/${name}-${step}.cmake) set(script ${stamp_dir}/${name}-${step}.cmake)
set(logbase ${stamp_dir}/${name}-${step}) set(logbase ${stamp_dir}/${name}-${step})
file(WRITE ${script} " file(WRITE ${script} "
${code_cygpath_make}
set(command \"${command}\") set(command \"${command}\")
execute_process( execute_process(
COMMAND \${command} COMMAND \${command}