[Cmake-commits] CMake branch, next, updated. v2.8.11-2067-ga532466
Stephen Kelly
steveire at gmail.com
Sat May 18 03:56:45 EDT 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 a5324669e23fbfb79e0b46d2043275cd685f6d74 (commit)
via 3c7c33292966a5bb35c6ff5a16aa10ccf643838a (commit)
from 0e7d67d050498d86e33b3914c51d0e9991e59e02 (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=a5324669e23fbfb79e0b46d2043275cd685f6d74
commit a5324669e23fbfb79e0b46d2043275cd685f6d74
Merge: 0e7d67d 3c7c332
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 18 03:56:44 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 18 03:56:44 2013 -0400
Merge topic 'fix-style' into next
3c7c332 Fix brace indentation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c7c33292966a5bb35c6ff5a16aa10ccf643838a
commit 3c7c33292966a5bb35c6ff5a16aa10ccf643838a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 18 09:54:50 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 18 09:54:50 2013 +0200
Fix brace indentation.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index ee5b9d8..fc3ad4e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2011,13 +2011,13 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags, cmTarget* target,
else
{
if (target->GetType() == cmTarget::OBJECT_LIBRARY)
- {
+ {
if (target->GetPropertyAsBool("POSITION_INDEPENDENT_CODE"))
{
this->AddPositionIndependentFlags(flags, lang, targetType);
}
return;
- }
+ }
if (target->GetLinkInterfaceDependentBoolProperty(
"POSITION_INDEPENDENT_CODE",
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalGenerator.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list