[Cmake-commits] CMake branch, next, updated. v2.8.12-4299-gb698e66

[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  b698e6691392d3f567815af0f347458bf10a1c74 (commit)
       via  b3ca81b23428d42f54da40f2f843059bb62eef5c (commit)
      from  b32b9f2a7ac9ef3f97ee67fc54442a04497b6ffa (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=b698e6691392d3f567815af0f347458bf10a1c74
commit b698e6691392d3f567815af0f347458bf10a1c74
Merge: b32b9f2 b3ca81b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 17:04:07 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 22 17:04:07 2013 -0400

    Merge topic 'fix-tll-static-private' into next
    
    b3ca81b CMP0022: Always add link libs entries to INTERFACE_LINK_LIBRARIES


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3ca81b23428d42f54da40f2f843059bb62eef5c
commit b3ca81b23428d42f54da40f2f843059bb62eef5c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 22:57:44 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 22 23:03:40 2013 +0200

    CMP0022: Always add link libs entries to INTERFACE_LINK_LIBRARIES
    
    Only conditionally wrap them in the LINK_ONLY generator expression.
    That expression only has an effect for actual target names anyway.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 24978d9..0b40d08 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -991,14 +991,14 @@ void cmTarget::MergeLinkLibraries( cmMakefile& mf,
 
     if (this->GetType() == cmTarget::STATIC_LIBRARY)
       {
+      std::string configLib = this->GetDebugGeneratorExpressions(lib,
+                                                                 i->second);
       if (cmGeneratorExpression::IsValidTargetName(lib)
           || cmGeneratorExpression::Find(lib) != std::string::npos)
         {
-        this->AppendProperty("INTERFACE_LINK_LIBRARIES",
-              ("$<LINK_ONLY:" +
-              this->GetDebugGeneratorExpressions(lib, i->second)
-              + ">").c_str());
+        configLib = "$<LINK_ONLY:" + configLib + ">";
         }
+        this->AppendProperty("INTERFACE_LINK_LIBRARIES", configLib.c_str());
       }
     }
   this->PrevLinkedLibraries = libs;
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index d3db514..9add198 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -395,14 +395,15 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const char* lib,
       {
       if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
         {
+        std::string configLib = this->Target
+                                     ->GetDebugGeneratorExpressions(lib, llt);
         if (cmGeneratorExpression::IsValidTargetName(lib)
             || cmGeneratorExpression::Find(lib) != std::string::npos)
           {
-          this->Target->AppendProperty("INTERFACE_LINK_LIBRARIES",
-                  ("$<LINK_ONLY:" +
-                  this->Target->GetDebugGeneratorExpressions(lib, llt) +
-                  ">").c_str());
+          configLib = "$<LINK_ONLY:" + configLib + ">";
           }
+        this->Target->AppendProperty("INTERFACE_LINK_LIBRARIES",
+                                     configLib.c_str());
         }
       // Not a 'public' or 'interface' library. Do not add to interface
       // property.
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
index 3e4144f..884db39 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
@@ -5,4 +5,4 @@ add_library(foo STATIC empty_vs6_1.cpp)
 add_library(bar STATIC empty_vs6_2.cpp)
 add_library(bat STATIC empty_vs6_3.cpp)
 target_link_libraries(foo bar)
-target_link_libraries(bar bat)
+target_link_libraries(bar bat "-lz -lm")

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

Summary of changes:
 Source/cmTarget.cxx                                |    8 ++++----
 Source/cmTargetLinkLibrariesCommand.cxx            |    9 +++++----
 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake |    2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake