diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-16 17:59:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-16 17:59:17 (GMT) |
| commit | 3573a94d729bb15d2a7c212a29ddbe012acd412b (patch) | |
| tree | 57afce4dca39b435c31ed2209e0dee42829135c3 /Modules/ExternalProject.cmake | |
| parent | 41a2fb5ba0df4dd70029e8701c7c3bd407e70032 (diff) | |
| parent | 45d2966dcc0ebc08a925d6ac2ba1831549faa345 (diff) | |
| download | CMake-3573a94d729bb15d2a7c212a29ddbe012acd412b.zip CMake-3573a94d729bb15d2a7c212a29ddbe012acd412b.tar.gz CMake-3573a94d729bb15d2a7c212a29ddbe012acd412b.tar.bz2 | |
Merge topic 'vs-no-indirect-output'
45d2966 VS: Avoid leaking child process output back to IDE (#14266)
Diffstat (limited to 'Modules/ExternalProject.cmake')
| -rw-r--r-- | Modules/ExternalProject.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 3acb4f9..0781ea1 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -970,7 +970,7 @@ endif() set(sep ";") endif() endforeach() - set(code "set(ENV{VS_UNICODE_OUTPUT} \"\")\n${code}set(command \"${cmd}\")${code_execute_process}") + set(code "${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() @@ -980,7 +980,6 @@ 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} |