kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmExportFileGenerator: Make SetImportLinkProperty a template 

Allow the vector of property entries to have any element type
that can convert to std::string.
This commit is contained in:
Brad King 2014-06-16 09:38:04 -04:00
parent 097be4139d
commit edce43514d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmExportFileGenerator.cxx
View File

@ -865,15 +865,16 @@ cmExportFileGenerator
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
template <typename T>
void void
cmExportFileGenerator cmExportFileGenerator
::SetImportLinkProperty(std::string const& suffix, ::SetImportLinkProperty(std::string const& suffix,
cmTarget* target, cmTarget* target,
const std::string& propName, const std::string& propName,
std::vector<std::string> const& entries, std::vector<T> const& entries,
ImportPropertyMap& properties, ImportPropertyMap& properties,
std::vector<std::string>& missingTargets std::vector<std::string>& missingTargets
) )
{ {
// Skip the property if there are no entries. // Skip the property if there are no entries.
if(entries.empty()) if(entries.empty())
@ -884,7 +885,7 @@ cmExportFileGenerator
// Construct the property value. // Construct the property value.
std::string link_entries; std::string link_entries;
const char* sep = ""; const char* sep = "";
for(std::vector<std::string>::const_iterator li = entries.begin(); for(typename std::vector<T>::const_iterator li = entries.begin();
li != entries.end(); ++li) li != entries.end(); ++li)
{ {
// Separate this from the previous entry. // Separate this from the previous entry.
@ -902,7 +903,6 @@ cmExportFileGenerator
properties[prop] = link_entries; properties[prop] = link_entries;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmExportFileGenerator::GenerateImportHeaderCode(std::ostream& os, void cmExportFileGenerator::GenerateImportHeaderCode(std::ostream& os,
const std::string& config) const std::string& config)

4
Source/cmExportFileGenerator.h
View File

@ -95,9 +95,11 @@ protected:
std::string const& suffix, cmTarget* target, std::string const& suffix, cmTarget* target,
ImportPropertyMap& properties, ImportPropertyMap& properties,
std::vector<std::string>& missingTargets); std::vector<std::string>& missingTargets);
template <typename T>
void SetImportLinkProperty(std::string const& suffix, void SetImportLinkProperty(std::string const& suffix,
cmTarget* target, const std::string& propName, cmTarget* target, const std::string& propName,
std::vector<std::string> const& entries, std::vector<T> const& entries,
ImportPropertyMap& properties, ImportPropertyMap& properties,
std::vector<std::string>& missingTargets); std::vector<std::string>& missingTargets);