From edce43514d854a84d2a00c975268f898bd1dda45 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 16 Jun 2014 09:38:04 -0400 Subject: cmExportFileGenerator: Make SetImportLinkProperty a template Allow the vector of property entries to have any element type that can convert to std::string. --- Source/cmExportFileGenerator.cxx | 8 ++++---- Source/cmExportFileGenerator.h | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 9f5eee5..1f39d7a 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -865,15 +865,16 @@ cmExportFileGenerator } //---------------------------------------------------------------------------- +template void cmExportFileGenerator ::SetImportLinkProperty(std::string const& suffix, cmTarget* target, const std::string& propName, - std::vector const& entries, + std::vector const& entries, ImportPropertyMap& properties, std::vector& missingTargets - ) + ) { // Skip the property if there are no entries. if(entries.empty()) @@ -884,7 +885,7 @@ cmExportFileGenerator // Construct the property value. std::string link_entries; const char* sep = ""; - for(std::vector::const_iterator li = entries.begin(); + for(typename std::vector::const_iterator li = entries.begin(); li != entries.end(); ++li) { // Separate this from the previous entry. @@ -902,7 +903,6 @@ cmExportFileGenerator properties[prop] = link_entries; } - //---------------------------------------------------------------------------- void cmExportFileGenerator::GenerateImportHeaderCode(std::ostream& os, const std::string& config) diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h index abd8ad5..919924e 100644 --- a/Source/cmExportFileGenerator.h +++ b/Source/cmExportFileGenerator.h @@ -95,9 +95,11 @@ protected: std::string const& suffix, cmTarget* target, ImportPropertyMap& properties, std::vector& missingTargets); + + template void SetImportLinkProperty(std::string const& suffix, cmTarget* target, const std::string& propName, - std::vector const& entries, + std::vector const& entries, ImportPropertyMap& properties, std::vector& missingTargets); -- cgit v0.12