[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1165-gd09d5bc

[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  d09d5bc7c785eea0977c9f4b337cb9e07b1801ac (commit)
       via  647ae8579f52486e56f0c2da327b9fef85ff947c (commit)
      from  48ad17b8523a4a4355c05baaa24e0bcdcabb51b2 (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=d09d5bc7c785eea0977c9f4b337cb9e07b1801ac
commit d09d5bc7c785eea0977c9f4b337cb9e07b1801ac
Merge: 48ad17b 647ae85
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 30 12:28:25 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 30 12:28:25 2012 -0500

    Merge topic 'add-INTERFACE_LINK_LIBRARIES-property' into next
    
    647ae85 Don't populate INTERFACE_LINK_LIBRARIES for static libs.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=647ae8579f52486e56f0c2da327b9fef85ff947c
commit 647ae8579f52486e56f0c2da327b9fef85ff947c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 30 18:12:32 2012 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Nov 30 18:23:57 2012 +0100

    Don't populate INTERFACE_LINK_LIBRARIES for static libs.
    
    Calls to target_link_libraries() won't populate the property,
    nor will set(CMAKE_INTERFACE_LINK_LIBRARIES ""), and it therefore
    won't be read for export either.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 50f74b9..bfdd13a 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1376,7 +1376,10 @@ void cmTarget::SetMakefile(cmMakefile* mf)
   this->SetPropertyDefault("AUTOMOC_MOC_OPTIONS", 0);
   this->SetPropertyDefault("LINK_DEPENDS_NO_SHARED", 0);
   this->SetPropertyDefault("LINK_INTERFACE_LIBRARIES", 0);
-  this->SetPropertyDefault("INTERFACE_LINK_LIBRARIES", 0);
+  if (this->GetType() != STATIC_LIBRARY)
+    {
+    this->SetPropertyDefault("INTERFACE_LINK_LIBRARIES", 0);
+    }
   this->SetPropertyDefault("WIN32_EXECUTABLE", 0);
   this->SetPropertyDefault("MACOSX_BUNDLE", 0);
 
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index d7a1443..f24180a 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -235,7 +235,10 @@ bool cmTargetLinkLibrariesCommand
   if(this->CurrentProcessingState != ProcessingLinkLibraries &&
      !this->Target->GetProperty("INTERFACE_LINK_LIBRARIES"))
     {
-    this->Target->SetProperty("INTERFACE_LINK_LIBRARIES", "");
+    if (this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+      {
+      this->Target->SetProperty("INTERFACE_LINK_LIBRARIES", "");
+      }
     }
   return true;
 }
@@ -289,8 +292,11 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const char* lib,
       }
     }
 
-  this->Target->AppendProperty("INTERFACE_LINK_LIBRARIES",
-                               generatorIface(lib, llt).c_str());
+  if (this->Target->GetType() != cmTarget::STATIC_LIBRARY)
+    {
+    this->Target->AppendProperty("INTERFACE_LINK_LIBRARIES",
+                                 generatorIface(lib, llt).c_str());
+    }
 
   // Get the list of configurations considered to be DEBUG.
   std::vector<std::string> const& debugConfigs =

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

Summary of changes:
 Source/cmTarget.cxx                     |    5 ++++-
 Source/cmTargetLinkLibrariesCommand.cxx |   12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake