summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileExecutableTargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-07-03 14:34:10 (GMT)
committerBrad King <brad.king@kitware.com>2009-07-03 14:34:10 (GMT)
commitbde145a212fb9f29c7cf7e37198e2783f7db3fbd (patch)
tree5e6266a219e0a1c9716f8e979ab078fff8ff6d6a /Source/cmMakefileExecutableTargetGenerator.cxx
parent275c21d3518a80aefa493131052c20e83676bc4a (diff)
downloadCMake-bde145a212fb9f29c7cf7e37198e2783f7db3fbd.zip
CMake-bde145a212fb9f29c7cf7e37198e2783f7db3fbd.tar.gz
CMake-bde145a212fb9f29c7cf7e37198e2783f7db3fbd.tar.bz2
ENH: Pass config to cmTarget::GetDirectory()
This teaches the makefile generators to always pass the configuration name to the cmTarget::GetDirectory method. Later this will allow per-configuration target output directories, and it cleans up use of the current API.
Diffstat (limited to 'Source/cmMakefileExecutableTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileExecutableTargetGenerator.cxx6
1 files changed, 3 insertions, 3 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 += "/";
}