diff options
| author | David Cole <david.cole@kitware.com> | 2011-01-07 07:59:21 -0500 |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-01-07 07:59:21 -0500 |
| commit | d7a87b52a0d5e71f1d3c6bcb58c9bc2ef1f438a9 (patch) | |
| tree | f1aa9571c86aea4f43ee7f8f305f4ba2f3fac521 /Modules/ExternalProject.cmake | |
| parent | 8e6ad8ce72d9f00a98b6dc4fbe66037c1f1372de (diff) | |
| parent | 44aff73d4a7cb407633ab7afc8a76774d4f69e4f (diff) | |
| download | cmake-d7a87b52a0d5e71f1d3c6bcb58c9bc2ef1f438a9.tar.gz | |
Merge branch 'ep-log-output-under-vs' into ep-fix-substitutions
Diffstat (limited to 'Modules/ExternalProject.cmake')
| -rw-r--r-- | Modules/ExternalProject.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index a3590cf8c6..1f8844e511 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -753,7 +753,7 @@ endif() set(sep ";") endif() 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}") set(command ${CMAKE_COMMAND} "-Dmake=\${make}" "-Dconfig=\${config}" -P ${stamp_dir}/${name}-${step}-impl.cmake) endif() @@ -763,6 +763,7 @@ endif() set(logbase ${stamp_dir}/${name}-${step}) file(WRITE ${script} " ${code_cygpath_make} +set(ENV{VS_UNICODE_OUTPUT} \"\") set(command \"${command}\") execute_process( COMMAND \${command} |