[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-422-gf4172dc

[Stephen Kelly]

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  f4172dce1680f567b6b853377ce4d8dbb1093c05 (commit)
       via  1c1c2a1201682d17491026cb392c31ae5e63e1a5 (commit)
      from  f8024bd6b69b84e5cd63ddf2e81be016c9f251b7 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4172dce1680f567b6b853377ce4d8dbb1093c05
commit f4172dce1680f567b6b853377ce4d8dbb1093c05
Merge: f8024bd 1c1c2a1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 11:07:04 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 11:07:04 2015 -0400

    Merge topic 'use-generator-target' into next
    
    1c1c2a12 cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c1c2a1201682d17491026cb392c31ae5e63e1a5
commit 1c1c2a1201682d17491026cb392c31ae5e63e1a5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 16 05:07:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 17:06:56 2015 +0200

    cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 26119c3..f39a67d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4418,7 +4418,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
 void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
                                std::string const& value,
                                std::string const& config,
-                               cmTarget const* headTarget,
+                               cmGeneratorTarget const* headTarget,
                                bool usage_requirements_only,
                                std::vector<cmLinkItem>& items,
                                bool& hadHeadSensitiveCondition) const
@@ -4437,7 +4437,7 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
                                       this->Makefile,
                                       config,
                                       false,
-                                      headTarget,
+                                      headTarget->Target,
                                       this->Target, &dagChecker), libs);
   this->LookupLinkItems(libs, items);
   hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition();
@@ -4977,7 +4977,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
     // The interface libraries have been explicitly set.
     this->ExpandLinkItems(linkIfaceProp, explicitLibraries,
                                   config,
-                                headTarget->Target, usage_requirements_only,
+                                headTarget, usage_requirements_only,
                                 iface.Libraries,
                                 iface.HadHeadSensitiveCondition);
     }
@@ -5004,7 +5004,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
         {
         bool hadHeadSensitiveConditionDummy = false;
         this->ExpandLinkItems(newProp, newExplicitLibraries, config,
-                              headTarget->Target,
+                              headTarget,
                               usage_requirements_only,
                               ifaceLibs, hadHeadSensitiveConditionDummy);
         }
@@ -5070,7 +5070,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
     cmSystemTools::ExpandListArgument(info->Languages, iface.Languages);
     this->ExpandLinkItems(info->LibrariesProp, info->Libraries,
                                   config,
-                          headTarget->Target, usage_requirements_only,
+                          headTarget, usage_requirements_only,
                           iface.Libraries,
                           iface.HadHeadSensitiveCondition);
     std::vector<std::string> deps;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 03548e2..799110c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -507,7 +507,8 @@ private:
   mutable std::set<std::string> LinkImplicitNullProperties;
 
   void ExpandLinkItems(std::string const& prop, std::string const& value,
-                       std::string const& config, cmTarget const* headTarget,
+                       std::string const& config,
+                       const cmGeneratorTarget* headTarget,
                        bool usage_requirements_only,
                        std::vector<cmLinkItem>& items,
                        bool& hadHeadSensitiveCondition) const;

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

Summary of changes:


hooks/post-receive
-- 
CMake