[Cmake-commits] CMake branch, next, updated. v2.8.8-3253-gff99095
David Cole
david.cole at kitware.com
Tue Jun 19 14:56:16 EDT 2012
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 ff9909535415436f5300f5dc6a26467cfd6a1532 (commit)
via f9383a9898b915fb836c8b7fe0877acc6aec78c6 (commit)
from bdc92a0ea113ec6d63f530088eb92124db8d9dab (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=ff9909535415436f5300f5dc6a26467cfd6a1532
commit ff9909535415436f5300f5dc6a26467cfd6a1532
Merge: bdc92a0 f9383a9
Author: David Cole <david.cole at kitware.com>
AuthorDate: Tue Jun 19 14:56:15 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 19 14:56:15 2012 -0400
Merge topic 'Ninja-absolute-compile-commands' into next
f9383a9 STYLE: Fix line length, remove extra blank line
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9383a9898b915fb836c8b7fe0877acc6aec78c6
commit f9383a9898b915fb836c8b7fe0877acc6aec78c6
Author: David Cole <david.cole at kitware.com>
AuthorDate: Tue Jun 19 14:49:13 2012 -0400
Commit: David Cole <david.cole at kitware.com>
CommitDate: Tue Jun 19 14:49:13 2012 -0400
STYLE: Fix line length, remove extra blank line
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 0c8ae8d..1063328 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -497,10 +497,10 @@ cmNinjaTargetGenerator
{
escapedSourceFileName = cmSystemTools::CollapseFullPath(
escapedSourceFileName.c_str(),
- this->GetGlobalGenerator()->GetCMakeInstance()->GetHomeOutputDirectory());
+ this->GetGlobalGenerator()->GetCMakeInstance()->
+ GetHomeOutputDirectory());
}
-
compileObjectVars.Source = escapedSourceFileName.c_str();
compileObjectVars.Object = objectFileName.c_str();
compileObjectVars.Flags = vars["FLAGS"].c_str();
-----------------------------------------------------------------------
Summary of changes:
Source/cmNinjaTargetGenerator.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list