[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2099-gf4ccda6
Stephen Kelly
steveire at gmail.com
Tue Feb 12 11:25:06 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 f4ccda667ab0f63f0480091b4e59cc6180c9426e (commit)
via 83519085e2c4bf704b539416c94ede581099f28d (commit)
from 3bb2ea08cfe1d3cf44dd8e445b91fef67ad39b52 (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=f4ccda667ab0f63f0480091b4e59cc6180c9426e
commit f4ccda667ab0f63f0480091b4e59cc6180c9426e
Merge: 3bb2ea0 8351908
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 12 11:25:04 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 12 11:25:04 2013 -0500
Merge topic 'linked-usage-cleanup' into next
8351908 Fix line length.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83519085e2c4bf704b539416c94ede581099f28d
commit 83519085e2c4bf704b539416c94ede581099f28d
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 12 17:22:15 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 12 17:24:06 2013 +0100
Fix line length.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1633b83..35ebf8d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2881,7 +2881,8 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config)
{
cmGeneratorExpression ge(lfbt);
cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(it->Value);
- std::string result = cge->Evaluate(this->Makefile, config, false, this, 0, 0);
+ std::string result = cge->Evaluate(this->Makefile, config,
+ false, this, 0, 0);
if (!this->Makefile->FindTargetToUse(result.c_str()))
{
continue;
@@ -2892,7 +2893,7 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config)
"$<TARGET_PROPERTY:" + it->Value + ",INTERFACE_INCLUDE_DIRECTORIES>");
linkInterfaceIncludeDirectoriesEntries.push_back(
- new cmTargetInternals::IncludeDirectoriesEntry(cge));
+ new cmTargetInternals::IncludeDirectoriesEntry(cge));
}
processIncludeDirectories(this,
@@ -2948,7 +2949,8 @@ std::string cmTarget::GetCompileDefinitions(const char *config)
{
if (this->Makefile->FindTargetToUse(it->c_str()))
{
- depString += sep + "$<TARGET_PROPERTY:" + *it + ",INTERFACE_COMPILE_DEFINITIONS>";
+ depString += sep + "$<TARGET_PROPERTY:"
+ + *it + ",INTERFACE_COMPILE_DEFINITIONS>";
sep = ";";
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmTarget.cxx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list