diff options
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 8 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index d64bc36..4e5c382 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -36,7 +36,7 @@ cmMakefileExecutableTargetGenerator if(this->Target->IsAppBundleOnApple()) { - this->MacContentDirectory = this->Target->GetDirectory(); + this->MacContentDirectory = this->Target->GetDirectory(this->ConfigName); this->MacContentDirectory += "/"; this->MacContentDirectory += this->TargetNameOut; this->MacContentDirectory += ".app/Contents/"; @@ -126,7 +126,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) this->ConfigName); // Construct the full path version of the names. - std::string outpath = this->Target->GetDirectory(); + std::string outpath = this->Target->GetDirectory(this->ConfigName); outpath += "/"; if(this->Target->IsAppBundleOnApple()) { @@ -150,7 +150,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) cmSystemTools::MakeDirectory(outpath.c_str()); if(!targetNameImport.empty()) { - outpathImp = this->Target->GetDirectory(0, true); + outpathImp = this->Target->GetDirectory(this->ConfigName, true); cmSystemTools::MakeDirectory(outpathImp.c_str()); outpathImp += "/"; } diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index ca47e33..8752702 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -39,7 +39,7 @@ cmMakefileLibraryTargetGenerator if(this->Target->IsFrameworkOnApple()) { this->FrameworkVersion = this->Target->GetFrameworkVersion(); - this->MacContentDirectory = this->Target->GetDirectory(); + this->MacContentDirectory = this->Target->GetDirectory(this->ConfigName); this->MacContentDirectory += "/"; this->MacContentDirectory += this->TargetNameOut; this->MacContentDirectory += ".framework/Versions/"; @@ -245,7 +245,7 @@ cmMakefileLibraryTargetGenerator std::string newName; // Compute the location of the top-level foo.framework directory. - std::string top = this->Target->GetDirectory(); + std::string top = this->Target->GetDirectory(this->ConfigName); top += "/"; top += this->TargetNameOut; top += ".framework/"; @@ -406,12 +406,12 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules } else { - outpath = this->Target->GetDirectory(); + outpath = this->Target->GetDirectory(this->ConfigName); cmSystemTools::MakeDirectory(outpath.c_str()); outpath += "/"; if(!targetNameImport.empty()) { - outpathImp = this->Target->GetDirectory(0, true); + outpathImp = this->Target->GetDirectory(this->ConfigName, true); cmSystemTools::MakeDirectory(outpathImp.c_str()); outpathImp += "/"; } diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 81fa4a1..e4dac5f 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -608,7 +608,7 @@ cmMakefileTargetGenerator this->Target->GetType() == cmTarget::SHARED_LIBRARY || this->Target->GetType() == cmTarget::MODULE_LIBRARY) { - targetFullPathPDB = this->Target->GetDirectory(); + targetFullPathPDB = this->Target->GetDirectory(this->ConfigName); targetFullPathPDB += "/"; targetFullPathPDB += this->Target->GetPDBName(this->ConfigName); } |