diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-11 20:52:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-11 20:52:30 (GMT) |
| commit | c39abc24111ecdfc1e8d6cb29c7687430e9aaca0 (patch) | |
| tree | 547891a1b4ad13857bc8224038e781d4943425d4 | |
| parent | 764015c2840b1059093e8af86dcbf96e048d2dfa (diff) | |
| parent | 44aff73d4a7cb407633ab7afc8a76774d4f69e4f (diff) | |
| download | CMake-c39abc24111ecdfc1e8d6cb29c7687430e9aaca0.zip CMake-c39abc24111ecdfc1e8d6cb29c7687430e9aaca0.tar.gz CMake-c39abc24111ecdfc1e8d6cb29c7687430e9aaca0.tar.bz2 | |
Merge topic 'ep-log-output-under-vs'
44aff73 ExternalProject: Avoid bleed-through output when logging.
| -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 a3590cf..1f8844e 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} |