[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1167-g18be299

[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  18be2992cfb7add736e00e405a0d8db7c7116003 (commit)
       via  d1961ab7c7c275e7bafe07e6fcd4d4c8b1a88b56 (commit)
      from  d09d5bc7c785eea0977c9f4b337cb9e07b1801ac (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=18be2992cfb7add736e00e405a0d8db7c7116003
commit 18be2992cfb7add736e00e405a0d8db7c7116003
Merge: d09d5bc d1961ab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 30 12:33:03 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 30 12:33:03 2012 -0500

    Merge topic 'add-INTERFACE_LINK_LIBRARIES-property' into next
    
    d1961ab Ignore INTERFACE_LINK_LIBRARIES when exporting static libraries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1961ab7c7c275e7bafe07e6fcd4d4c8b1a88b56
commit d1961ab7c7c275e7bafe07e6fcd4d4c8b1a88b56
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 30 18:31:38 2012 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Nov 30 18:31:38 2012 +0100

    Ignore INTERFACE_LINK_LIBRARIES when exporting static libraries
    
    Even if the user calls set_property to set the property, we don't
    export it.

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index a86f8c4..3812516 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -37,9 +37,12 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
 
       if ((*tei)->GetPolicyStatusCMP0019() == cmPolicies::NEW)
         {
-        this->PopulateInterfaceProperty("INTERFACE_LINK_LIBRARIES", te,
+        if ((*tei)->GetType() != cmTarget::STATIC_LIBRARY)
+          {
+          this->PopulateInterfaceProperty("INTERFACE_LINK_LIBRARIES", te,
                                         cmGeneratorExpression::BuildInterface,
                                         properties);
+          }
         }
 
       this->GenerateInterfaceProperties(te, os, properties);
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 4fef08e..a988f63 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -54,10 +54,13 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
       if ((*tei)->Target->GetPolicyStatusCMP0019() == cmPolicies::NEW)
         {
-        this->PopulateInterfaceProperty("INTERFACE_LINK_LIBRARIES",
+        if (te->Target->GetType() != cmTarget::STATIC_LIBRARY)
+          {
+          this->PopulateInterfaceProperty("INTERFACE_LINK_LIBRARIES",
                                       te->Target,
                                       cmGeneratorExpression::InstallInterface,
                                       properties);
+          }
         }
 
       this->GenerateInterfaceProperties(te->Target, os, properties);

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

Summary of changes:
 Source/cmExportBuildFileGenerator.cxx   |    5 ++++-
 Source/cmExportInstallFileGenerator.cxx |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake