[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4302-g423bd67

[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  423bd677069347e3ef77bfc7e97c902a994701a1 (commit)
       via  0ad2a1c18148b995a6a13be32ce93a625332defd (commit)
      from  dd4898140626ebe84a96eb18b4af0bdcb5926c2a (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=423bd677069347e3ef77bfc7e97c902a994701a1
commit 423bd677069347e3ef77bfc7e97c902a994701a1
Merge: dd48981 0ad2a1c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 24 09:15:39 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 24 09:15:39 2013 -0400

    Merge topic 'private-link-depends-are-package-private' into next
    
    0ad2a1c Export: Never treat private link libraries as public package dependencies.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ad2a1c18148b995a6a13be32ce93a625332defd
commit 0ad2a1c18148b995a6a13be32ce93a625332defd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 24 15:06:56 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Sep 24 15:06:56 2013 +0200

    Export: Never treat private link libraries as public package dependencies.
    
    Multiple libraries in a single buildsystem can be exported to multiple
    export-sets.
    
    If a library from one export set depends on a library from
    another export set, the export logic generates a check in the targets
    file to verify that the target in the other export set is found. That
    check is executed at downstream-find_package-time.
    
    However, a target may depend privately on a target in another export
    set. In that case, the depend used to also be listed in the required
    targets in the targets file. Change the export logic to ignore the
    private link entries instead.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index ef336ea..0a93533 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -736,9 +736,10 @@ cmExportFileGenerator
                                 "IMPORTED_LINK_INTERFACE_LANGUAGES",
                                 iface->Languages, properties, missingTargets);
 
+    std::vector<std::string> dummy;
     this->SetImportLinkProperty(suffix, target,
                                 "IMPORTED_LINK_DEPENDENT_LIBRARIES",
-                                iface->SharedDeps, properties, missingTargets);
+                                iface->SharedDeps, properties, dummy);
     if(iface->Multiplicity > 0)
       {
       std::string prop = "IMPORTED_LINK_INTERFACE_MULTIPLICITY";

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

Summary of changes:
 Source/cmExportFileGenerator.cxx |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake