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

Merge topic 'vs-no-indirect-output' 

45d2966 VS: Avoid leaking child process output back to IDE (#14266)
This commit is contained in:
Brad King 2013-07-16 13:59:17 -04:00 committed by CMake Topic Stage
parent 41a2fb5ba0 45d2966dcc
commit 3573a94d72
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/ExternalProject.cmake
View File

@ -970,7 +970,7 @@ endif()
set(sep ";") set(sep ";")
endif() endif()
endforeach() 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}") 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()
@ -980,7 +980,6 @@ 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}

1
Modules/GetPrerequisites.cmake
View File

@ -635,7 +635,6 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
set(gp_regex_fallback "") set(gp_regex_fallback "")
set(gp_regex_cmp_count 1) set(gp_regex_cmp_count 1)
set(gp_tool_known 1) set(gp_tool_known 1)
set(ENV{VS_UNICODE_OUTPUT} "") # Block extra output from inside VS IDE.
endif() endif()
if("${gp_tool}" STREQUAL "objdump") if("${gp_tool}" STREQUAL "objdump")

10
Source/cmSystemTools.cxx
View File

@ -1696,6 +1696,7 @@ cmSystemTools::SaveRestoreEnvironment::~SaveRestoreEnvironment()
void cmSystemTools::EnableVSConsoleOutput() void cmSystemTools::EnableVSConsoleOutput()
{ {
#ifdef _WIN32
// Visual Studio 8 2005 (devenv.exe or VCExpress.exe) will not // Visual Studio 8 2005 (devenv.exe or VCExpress.exe) will not
// display output to the console unless this environment variable is // display output to the console unless this environment variable is
// set. We need it to capture the output of these build tools. // set. We need it to capture the output of these build tools.
@ -1703,8 +1704,15 @@ void cmSystemTools::EnableVSConsoleOutput()
// either of these executables where NAME is created with // either of these executables where NAME is created with
// CreateNamedPipe. This would bypass the internal buffering of the // CreateNamedPipe. This would bypass the internal buffering of the
// output and allow it to be captured on the fly. // output and allow it to be captured on the fly.
#ifdef _WIN32
cmSystemTools::PutEnv("vsconsoleoutput=1"); cmSystemTools::PutEnv("vsconsoleoutput=1");
# ifdef CMAKE_BUILD_WITH_CMAKE
// VS sets an environment variable to tell MS tools like "cl" to report
// output through a backdoor pipe instead of stdout/stderr. Unset the
// environment variable to close this backdoor for any path of process
// invocations that passes through CMake so we can capture the output.
cmSystemTools::UnsetEnv("VS_UNICODE_OUTPUT");
# endif
#endif #endif
} }