This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 45b76aa112d7afdd61a71cc62b37f94a94872081 (commit) via 44aff73d4a7cb407633ab7afc8a76774d4f69e4f (commit) from 64e940f7fa3625db7efce4c1935e5a2c42cadba6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45b76aa112d7afdd61a71cc62b37f94a94872081 commit 45b76aa112d7afdd61a71cc62b37f94a94872081 Merge: 64e940f 44aff73 Author: David Cole <david.c...@kitware.com> AuthorDate: Thu Jan 6 18:51:09 2011 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Jan 6 18:51:09 2011 -0500 Merge topic 'ep-log-output-under-vs' into next 44aff73 ExternalProject: Avoid bleed-through output when logging. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44aff73d4a7cb407633ab7afc8a76774d4f69e4f commit 44aff73d4a7cb407633ab7afc8a76774d4f69e4f Author: David Cole <david.c...@kitware.com> AuthorDate: Thu Jan 6 18:29:44 2011 -0500 Commit: David Cole <david.c...@kitware.com> CommitDate: Thu Jan 6 18:29:44 2011 -0500 ExternalProject: Avoid bleed-through output when logging. Unset VS_UNICODE_OUTPUT when executing a command whose output is being logged to a file. Previously, running Microsoft tools in sub-processes of Visual Studio would send their output to the Visual Studio output pipe named by this environment variable. Unsetting it forces the output back to the normal stdout and stderr channels where cmake can intercept it and direct it to the appropriate log files. diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 997164a..9735eb4 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -711,7 +711,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() @@ -721,6 +721,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} ----------------------------------------------------------------------- Summary of changes: Modules/ExternalProject.cmake | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits