summaryrefslogtreecommitdiffstats
path: root/Source/cmExportInstallFileGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-12-19 13:24:46 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-12-19 23:56:17 (GMT)
commitb51b6e97a26b604f184646003adb7d5fb6077131 (patch)
tree6d1d02b0ee3892e88d4aad21f6b5385a2a7e7df7 /Source/cmExportInstallFileGenerator.cxx
parentcad5c79e6c125e93e2c4f9e494ffdb7c18358bb8 (diff)
downloadCMake-b51b6e97a26b604f184646003adb7d5fb6077131.zip
CMake-b51b6e97a26b604f184646003adb7d5fb6077131.tar.gz
CMake-b51b6e97a26b604f184646003adb7d5fb6077131.tar.bz2
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.
Diffstat (limited to 'Source/cmExportInstallFileGenerator.cxx')
-rw-r--r--Source/cmExportInstallFileGenerator.cxx12
1 files changed, 5 insertions, 7 deletions
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,