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

Export: Port internal API to cmGeneratorTarget.

This commit is contained in:
Stephen Kelly 2015-10-17 15:10:32 +02:00
parent e666128243
commit d231c31b98
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmExportBuildFileGenerator.cxx
View File

@ -174,7 +174,7 @@ cmExportBuildFileGenerator
// properties); // properties);
// Generate code in the export file. // Generate code in the export file.
this->GenerateImportPropertyCode(os, config, target->Target, this->GenerateImportPropertyCode(os, config, target,
properties); properties);
} }
} }

8
Source/cmExportFileGenerator.cxx
View File

@ -1108,13 +1108,13 @@ cmExportFileGenerator
void void
cmExportFileGenerator cmExportFileGenerator
::GenerateImportPropertyCode(std::ostream& os, const std::string& config, ::GenerateImportPropertyCode(std::ostream& os, const std::string& config,
cmTarget const* target, cmGeneratorTarget const* target,
ImportPropertyMap const& properties) ImportPropertyMap const& properties)
{ {
// Construct the imported target name. // Construct the imported target name.
std::string targetName = this->Namespace; std::string targetName = this->Namespace;
targetName += target->GetExportName(); targetName += target->Target->GetExportName();
// Set the import properties. // Set the import properties.
os << "# Import target \"" << targetName << "\" for configuration \"" os << "# Import target \"" << targetName << "\" for configuration \""
@ -1228,13 +1228,13 @@ cmExportFileGenerator::GenerateImportedFileCheckLoop(std::ostream& os)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void void
cmExportFileGenerator cmExportFileGenerator
::GenerateImportedFileChecksCode(std::ostream& os, cmTarget* target, ::GenerateImportedFileChecksCode(std::ostream& os, cmGeneratorTarget* target,
ImportPropertyMap const& properties, ImportPropertyMap const& properties,
const std::set<std::string>& importedLocations) const std::set<std::string>& importedLocations)
{ {
// Construct the imported target name. // Construct the imported target name.
std::string targetName = this->Namespace; std::string targetName = this->Namespace;
targetName += target->GetExportName(); targetName += target->Target->GetExportName();
os << "list(APPEND _IMPORT_CHECK_TARGETS " << targetName << " )\n" os << "list(APPEND _IMPORT_CHECK_TARGETS " << targetName << " )\n"
"list(APPEND _IMPORT_CHECK_FILES_FOR_" << targetName << " "; "list(APPEND _IMPORT_CHECK_FILES_FOR_" << targetName << " ";

5
Source/cmExportFileGenerator.h
View File

@ -78,9 +78,10 @@ protected:
void GenerateImportTargetCode(std::ostream& os, void GenerateImportTargetCode(std::ostream& os,
cmGeneratorTarget const* target); cmGeneratorTarget const* target);
void GenerateImportPropertyCode(std::ostream& os, const std::string& config, void GenerateImportPropertyCode(std::ostream& os, const std::string& config,
cmTarget const* target, cmGeneratorTarget const* target,
ImportPropertyMap const& properties); ImportPropertyMap const& properties);
void GenerateImportedFileChecksCode(std::ostream& os, cmTarget* target, void GenerateImportedFileChecksCode(std::ostream& os,
cmGeneratorTarget* target,
ImportPropertyMap const& properties, ImportPropertyMap const& properties,
const std::set<std::string>& importedLocations); const std::set<std::string>& importedLocations);
void GenerateImportedFileCheckLoop(std::ostream& os); void GenerateImportedFileCheckLoop(std::ostream& os);

4
Source/cmExportInstallFileGenerator.cxx
View File

@ -375,8 +375,8 @@ cmExportInstallFileGenerator
// properties); // properties);
// Generate code in the export file. // Generate code in the export file.
this->GenerateImportPropertyCode(os, config, gtgt->Target, properties); this->GenerateImportPropertyCode(os, config, gtgt, properties);
this->GenerateImportedFileChecksCode(os, gtgt->Target, properties, this->GenerateImportedFileChecksCode(os, gtgt, properties,
importedLocations); importedLocations);
} }
} }