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

Merge branch 'ep-log-output-under-vs' into ep-fix-substitutions

This commit is contained in:
David Cole 2011-01-07 07:59:21 -05:00
parent 8e6ad8ce72 44aff73d4a
commit d7a87b52a0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/ExternalProject.cmake
View File

@ -753,7 +753,7 @@ endif()
set(sep ";") set(sep ";")
endif() endif()
endforeach() endforeach()
set(code "${code}set(command \"${cmd}\")${code_execute_process}") set(code "set(ENV{VS_UNICODE_OUTPUT} \"\")\n${code}set(command \"${cmd}\")${code_execute_process}")
file(WRITE ${stamp_dir}/${name}-${step}-impl.cmake "${code}") file(WRITE ${stamp_dir}/${name}-${step}-impl.cmake "${code}")
set(command ${CMAKE_COMMAND} "-Dmake=\${make}" "-Dconfig=\${config}" -P ${stamp_dir}/${name}-${step}-impl.cmake) set(command ${CMAKE_COMMAND} "-Dmake=\${make}" "-Dconfig=\${config}" -P ${stamp_dir}/${name}-${step}-impl.cmake)
endif() endif()
@ -763,6 +763,7 @@ endif()
set(logbase ${stamp_dir}/${name}-${step}) set(logbase ${stamp_dir}/${name}-${step})
file(WRITE ${script} " file(WRITE ${script} "
${code_cygpath_make} ${code_cygpath_make}
set(ENV{VS_UNICODE_OUTPUT} \"\")
set(command \"${command}\") set(command \"${command}\")
execute_process( execute_process(
COMMAND \${command} COMMAND \${command}