diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-17 13:05:46 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-18 14:29:30 (GMT) |
| commit | e6661282436d7901617d2f96d9acf9d4cb7db9d5 (patch) | |
| tree | 9af878214e82ee76a101ac1701c986fb71adf841 /Source/cmExportBuildFileGenerator.cxx | |
| parent | 2b9cc1e24871c6b527900e119640ef0adf706f0d (diff) | |
| download | CMake-e6661282436d7901617d2f96d9acf9d4cb7db9d5.zip CMake-e6661282436d7901617d2f96d9acf9d4cb7db9d5.tar.gz CMake-e6661282436d7901617d2f96d9acf9d4cb7db9d5.tar.bz2 | |
Export: Port internal utility to cmGeneratorTarget.
Diffstat (limited to 'Source/cmExportBuildFileGenerator.cxx')
| -rw-r--r-- | Source/cmExportBuildFileGenerator.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index c24138f..cf84146 100644 --- a/Source/cmExportBuildFileGenerator.cxx +++ b/Source/cmExportBuildFileGenerator.cxx @@ -237,14 +237,15 @@ void cmExportBuildFileGenerator::HandleMissingTarget( std::string& link_libs, std::vector<std::string>& missingTargets, - cmTarget* depender, - cmTarget* dependee) + cmGeneratorTarget* depender, + cmGeneratorTarget* dependee) { // The target is not in the export. if(!this->AppendMode) { const std::string name = dependee->GetName(); - cmGlobalGenerator* gg = dependee->GetMakefile()->GetGlobalGenerator(); + cmGlobalGenerator* gg = + dependee->GetLocalGenerator()->GetGlobalGenerator(); std::vector<std::string> namespaces = this->FindNamespaces(gg, name); int targetOccurrences = (int)namespaces.size(); @@ -252,7 +253,7 @@ cmExportBuildFileGenerator::HandleMissingTarget( { std::string missingTarget = namespaces[0]; - missingTarget += dependee->GetExportName(); + missingTarget += dependee->Target->GetExportName(); link_libs += missingTarget; missingTargets.push_back(missingTarget); return; @@ -267,7 +268,7 @@ cmExportBuildFileGenerator::HandleMissingTarget( // Assume the target will be exported by another command. // Append it with the export namespace. link_libs += this->Namespace; - link_libs += dependee->GetExportName(); + link_libs += dependee->Target->GetExportName(); } //---------------------------------------------------------------------------- @@ -315,8 +316,8 @@ cmExportBuildFileGenerator //---------------------------------------------------------------------------- void cmExportBuildFileGenerator -::ComplainAboutMissingTarget(cmTarget* depender, - cmTarget* dependee, +::ComplainAboutMissingTarget(cmGeneratorTarget* depender, + cmGeneratorTarget* dependee, int occurrences) { if(cmSystemTools::GetErrorOccuredFlag()) |