[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6292-g742ee0e

[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  742ee0ed00ca7d3203e26bea735ed34e3403e39c (commit)
       via  b51b6e97a26b604f184646003adb7d5fb6077131 (commit)
      from  3ceceaf7d4dfdc40d738c2e8544dc4cbdde17e15 (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=742ee0ed00ca7d3203e26bea735ed34e3403e39c
commit 742ee0ed00ca7d3203e26bea735ed34e3403e39c
Merge: 3ceceaf b51b6e9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Dec 19 18:56:34 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 19 18:56:34 2013 -0500

    Merge topic 'minor-cleanup' into next
    
    b51b6e9 Export: Skip INTERFACE libraries when generating -config files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b51b6e97a26b604f184646003adb7d5fb6077131
commit b51b6e97a26b604f184646003adb7d5fb6077131
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Dec 19 14:24:46 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Dec 20 00:56:17 2013 +0100

    Export: Skip INTERFACE libraries when generating -config files.
    
    The properties object has just been created, so is always empty,
    which means the if block is never entered. The following lines do
    not have any effect because an INTERFACE library has no LOCATION.
    At the end, no code is generated for INTERFACE libraries in
    config-specific exported files, so skip them early.

diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 79e78df..1025dc0 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -297,16 +297,14 @@ cmExportInstallFileGenerator
     {
     // Collect import properties for this target.
     cmTargetExport const* te = *tei;
-    ImportPropertyMap properties;
-    std::set<std::string> importedLocations;
-    if (!properties.empty()
-        && te->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+    if (te->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
       {
-      this->GenerateImportPropertyCode(os, config, te->Target, properties);
-      this->GenerateImportedFileChecksCode(os, te->Target, properties,
-                                           importedLocations);
       continue;
       }
+
+    ImportPropertyMap properties;
+    std::set<std::string> importedLocations;
+
     this->SetImportLocationProperty(config, suffix, te->ArchiveGenerator,
                                     properties, importedLocations);
     this->SetImportLocationProperty(config, suffix, te->LibraryGenerator,

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

Summary of changes:


hooks/post-receive
-- 
CMake