[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1565-gcc0c4d8

Stephen Kelly steveire at gmail.com
Thu Feb 20 13:51:19 EST 2014


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  cc0c4d8eda8bb9f890142f848cbdec144ff0c96a (commit)
       via  716fd967ef673348aa37c9b5b44982663bebadd2 (commit)
      from  c0da77f50251b68d982cab1a9c17f142849552e9 (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=cc0c4d8eda8bb9f890142f848cbdec144ff0c96a
commit cc0c4d8eda8bb9f890142f848cbdec144ff0c96a
Merge: c0da77f 716fd96
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 20 13:51:18 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 20 13:51:18 2014 -0500

    Merge topic 'target-SOURCES-refactor' into next
    
    716fd967 Fix whitespace.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=716fd967ef673348aa37c9b5b44982663bebadd2
commit 716fd967ef673348aa37c9b5b44982663bebadd2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 20 19:50:32 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 20 19:50:32 2014 +0100

    Fix whitespace.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 437b2a2..f833515 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5244,9 +5244,9 @@ cmTarget::GetLinkInterfaceLibraries(const char* config,
     // Compute the link interface for this configuration.
     cmTargetInternals::OptionalLinkInterface iface;
     iface.ExplicitLibraries = this->ComputeLinkInterfaceLibraries(config,
-                                                                  iface,
-                                                                  head,
-                                                                  iface.Exists);
+                                                                iface,
+                                                                head,
+                                                                iface.Exists);
 
     // Store the information for this configuration.
     cmTargetInternals::LinkInterfaceMapType::value_type entry(key, iface);
@@ -5273,7 +5273,8 @@ void processILibs(const char* config,
                           tgt->GetLinkInterfaceLibraries(config, headTarget);
       if (iface)
         {
-        for(std::vector<std::string>::const_iterator it = iface->Libraries.begin();
+        for(std::vector<std::string>::const_iterator
+            it = iface->Libraries.begin();
             it != iface->Libraries.end(); ++it)
           {
           processILibs(config, headTarget, *it, tgts, emitted);
@@ -5305,8 +5306,8 @@ void cmTarget::GetTransitivePropertyTargets(const char* config,
                                       cmTarget const* headTarget,
                                       std::vector<cmTarget*> &tgts) const
 {
-  cmTarget::LinkInterface const* iface = this->GetLinkInterfaceLibraries(config,
-                                                                headTarget);
+  cmTarget::LinkInterface const* iface
+                        = this->GetLinkInterfaceLibraries(config, headTarget);
   if (!iface)
     {
     return;
@@ -5352,7 +5353,8 @@ void cmTarget::GetTransitivePropertyTargets(const char* config,
   for(std::vector<std::string>::const_iterator it = libs.begin();
       it != libs.end(); ++it)
     {
-    if (cmTarget* tgt = headTarget->GetMakefile()->FindTargetToUse(it->c_str()))
+    if (cmTarget* tgt = headTarget->GetMakefile()
+                                  ->FindTargetToUse(it->c_str()))
       {
       tgts.push_back(tgt);
       }
@@ -5595,8 +5597,8 @@ void cmTargetInternals::ComputeLinkInterface(cmTarget const* thisTarget,
         || thisTarget->PolicyStatusCMP0022 == cmPolicies::OLD)
     {
     // The link implementation is the default link interface.
-    cmTarget::LinkImplementation const* impl = thisTarget->GetLinkImplementation(config,
-                                                              headTarget);
+    cmTarget::LinkImplementation const*
+                impl = thisTarget->GetLinkImplementation(config, headTarget);
     iface.ImplementationIsInterface = true;
     iface.WrongConfigLibraries = impl->WrongConfigLibraries;
     if(thisTarget->LinkLanguagePropagatesToDependents())

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTarget.cxx |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list