[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1909-gc93e24c
Brad King
brad.king at kitware.com
Mon Feb 4 16:26:31 EST 2013
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 c93e24cf6bc5b55488b85d127c67bfa03dc93b48 (commit)
via 47ff49b09e0ba664cd7215d5dc00590d286e1908 (commit)
from 22c83a198c09b939ff0b0b9eb76cbef6d1ae6754 (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=c93e24cf6bc5b55488b85d127c67bfa03dc93b48
commit c93e24cf6bc5b55488b85d127c67bfa03dc93b48
Merge: 22c83a1 47ff49b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 4 16:26:27 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 4 16:26:27 2013 -0500
Merge topic 'ninja-link-rsp-newlines' into next
47ff49b Ninja: Fix line length
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47ff49b09e0ba664cd7215d5dc00590d286e1908
commit 47ff49b09e0ba664cd7215d5dc00590d286e1908
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 4 16:26:05 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 4 16:26:05 2013 -0500
Ninja: Fix line length
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 12ebe44..7e48cd7 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -190,7 +190,7 @@ cmNinjaNormalTargetGenerator
linkOptionVar += cmTarget::GetTargetTypeName(targetType);
const std::string linkOption =
GetMakefile()->GetSafeDefinition(linkOptionVar.c_str());
- rspcontent = "$in_newline " + linkOption + " $LINK_PATH $LINK_LIBRARIES";
+ rspcontent = "$in_newline "+linkOption+" $LINK_PATH $LINK_LIBRARIES";
vars.Objects = responseFlag.c_str();
vars.LinkLibraries = "";
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmNinjaNormalTargetGenerator.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list