diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-08-04 17:19:44 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-08-05 16:20:46 (GMT) |
commit | 47803e6f8e98984e740acf2f7c0a217de58717cd (patch) | |
tree | 37fed0fa8c383d533c0be33d322518b2739080d9 /Source/cmInstallTargetGenerator.cxx | |
parent | 7da4c9d4edbdd6df6aa2a9467d6f32a98fc8cac4 (diff) | |
download | CMake-47803e6f8e98984e740acf2f7c0a217de58717cd.zip CMake-47803e6f8e98984e740acf2f7c0a217de58717cd.tar.gz CMake-47803e6f8e98984e740acf2f7c0a217de58717cd.tar.bz2 |
cmGeneratorTarget: Move GetExecutableNames from cmTarget.
Diffstat (limited to 'Source/cmInstallTargetGenerator.cxx')
-rw-r--r-- | Source/cmInstallTargetGenerator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index c64f9a3..c872859 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -125,7 +125,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os, std::string targetNameReal; std::string targetNameImport; std::string targetNamePDB; - this->Target->Target->GetExecutableNames(targetName, targetNameReal, + this->Target->GetExecutableNames(targetName, targetNameReal, targetNameImport, targetNamePDB, config); if(this->ImportLibrary) @@ -372,13 +372,16 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget const* target, { std::string fname; // Compute the name of the library. + cmGeneratorTarget *gtgt = target->GetMakefile() + ->GetGlobalGenerator() + ->GetGeneratorTarget(target); if(target->GetType() == cmTarget::EXECUTABLE) { std::string targetName; std::string targetNameReal; std::string targetNameImport; std::string targetNamePDB; - target->GetExecutableNames(targetName, targetNameReal, + gtgt->GetExecutableNames(targetName, targetNameReal, targetNameImport, targetNamePDB, config); if(nameType == NameImplib) |