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 c306295ce376715baea6fedaa5128379dd019de4 (commit)
via 4ddd3b9fd1f6f083561ba47acf6ed3cfc3d871c9 (commit)
via caeca30936fee174fd36cb3bb0ecb45847aae873 (commit)
via b32000865869a1ee36000216e5766e012256782e (commit)
from 29917701584cb80e708d1a7d8ad4458a46becf04 (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=c306295ce376715baea6fedaa5128379dd019de4
commit c306295ce376715baea6fedaa5128379dd019de4
Merge: 2991770 4ddd3b9
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Fri Jul 20 11:19:20 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jul 20 11:19:20 2012 -0400
Merge topic 'use_normal_ouput_with_chdir' into next
4ddd3b9 Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
caeca30 CMake Nightly Date Stamp
b320008 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ddd3b9fd1f6f083561ba47acf6ed3cfc3d871c9
commit 4ddd3b9fd1f6f083561ba47acf6ed3cfc3d871c9
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Fri Jul 20 11:09:52 2012 -0400
Commit: Bill Hoffman <bill.hoff...@kitware.com>
CommitDate: Fri Jul 20 11:09:52 2012 -0400
Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
Using OUTPUT_MERGE can cause the output to be jumbled in some cases.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 451aec8..f523423 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1423,7 +1423,7 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>&
args)
int retval = 0;
int timeout = 0;
if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, &retval,
- directory.c_str(), cmSystemTools::OUTPUT_MERGE, timeout) )
+ directory.c_str(), cmSystemTools::OUTPUT_NORMAL, timeout) )
{
return retval;
}
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmake.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
