[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2847-gbea0f04

[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  bea0f04c3dccb43058e955cb6a61288ccd8404d0 (commit)
       via  fbb76d017238db90783d2d9126263aa175c04074 (commit)
      from  7bb526b3a759f57837881381416c79e49981de28 (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=bea0f04c3dccb43058e955cb6a61288ccd8404d0
commit bea0f04c3dccb43058e955cb6a61288ccd8404d0
Merge: 7bb526b fbb76d0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 30 19:36:05 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 30 19:36:05 2013 -0400

    Merge topic 'fix-per-config-tll-include-dirs' into next
    
    fbb76d0 Ensure that link dependent include directories are up to date.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbb76d017238db90783d2d9126263aa175c04074
commit fbb76d017238db90783d2d9126263aa175c04074
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 30 10:42:10 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 30 10:52:05 2013 +0200

    Ensure that link dependent include directories are up to date.
    
    If users set the LINK_LIBRARIES property directly, the interface
    include directories from the entries they add should be processed.
    Add special handling of the property to implement that.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 6c639f1..1ccfa47 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2706,6 +2706,19 @@ void cmTarget::SetProperty(const char* prop, const char* value)
                           new cmTargetInternals::IncludeDirectoriesEntry(cge));
     return;
     }
+  if (strcmp(prop, "LINK_LIBRARIES") == 0)
+    {
+    this->Internal->LinkInterfaceIncludeDirectoriesEntries.clear();
+    if (cmGeneratorExpression::IsValidTargetName(value)
+        || cmGeneratorExpression::Find(value) != std::string::npos)
+      {
+      cmListFileBacktrace lfbt;
+      this->Makefile->GetBacktrace(lfbt);
+      cmValueWithOrigin entry(value, lfbt);
+      this->Internal->LinkInterfaceIncludeDirectoriesEntries.push_back(entry);
+      }
+    // Fall through
+    }
   this->Properties.SetProperty(prop, value, cmProperty::TARGET);
   this->MaybeInvalidatePropertyCache(prop);
 }
@@ -2727,6 +2740,18 @@ void cmTarget::AppendProperty(const char* prop, const char* value,
               new cmTargetInternals::IncludeDirectoriesEntry(ge.Parse(value)));
     return;
     }
+  if (strcmp(prop, "LINK_LIBRARIES") == 0)
+    {
+    if (cmGeneratorExpression::IsValidTargetName(value)
+        || cmGeneratorExpression::Find(value) != std::string::npos)
+      {
+      cmListFileBacktrace lfbt;
+      this->Makefile->GetBacktrace(lfbt);
+      cmValueWithOrigin entry(value, lfbt);
+      this->Internal->LinkInterfaceIncludeDirectoriesEntries.push_back(entry);
+      }
+    // Fall through
+    }
   this->Properties.AppendProperty(prop, value, cmProperty::TARGET, asString);
   this->MaybeInvalidatePropertyCache(prop);
 }
@@ -2763,12 +2788,6 @@ void cmTarget::AppendBuildInterfaceIncludes()
 }
 
 //----------------------------------------------------------------------------
-void cmTarget::AppendTllInclude(const cmValueWithOrigin &entry)
-{
-  this->Internal->LinkInterfaceIncludeDirectoriesEntries.push_back(entry);
-}
-
-//----------------------------------------------------------------------------
 void cmTarget::InsertInclude(const cmValueWithOrigin &entry,
                      bool before)
 {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index e25133e..9d46796 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -495,7 +495,6 @@ public:
   std::vector<std::string> GetIncludeDirectories(const char *config);
   void InsertInclude(const cmValueWithOrigin &entry,
                      bool before = false);
-  void AppendTllInclude(const cmValueWithOrigin &entry);
 
   void AppendBuildInterfaceIncludes();
 
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 60a4011..b7b7691 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -259,16 +259,6 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const char* lib,
   // Handle normal case first.
   if(this->CurrentProcessingState != ProcessingLinkInterface)
     {
-    if (cmGeneratorExpression::IsValidTargetName(lib)
-        || cmGeneratorExpression::Find(lib) != std::string::npos)
-      {
-      cmListFileBacktrace lfbt;
-      this->Makefile->GetBacktrace(lfbt);
-      cmValueWithOrigin entry(this->Target->GetDebugGeneratorExpressions(lib,
-                                                                        llt),
-                              lfbt);
-      this->Target->AppendTllInclude(entry);
-      }
     this->Makefile
       ->AddLinkLibraryForTarget(this->Target->GetName(), lib, llt);
     if (this->CurrentProcessingState != ProcessingPublicInterface)

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

Summary of changes:
 Source/cmTarget.cxx                     |   31 +++++++++++++++++++++++++------
 Source/cmTarget.h                       |    1 -
 Source/cmTargetLinkLibrariesCommand.cxx |   10 ----------
 3 files changed, 25 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake