diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-03 13:56:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-03 13:56:32 (GMT) |
| commit | b0759da303ebf8a49cb840504591c92fd290f419 (patch) | |
| tree | bdf08b3919b5c068e51fef9040ac05432e2481d4 /Source/cmMakefileExecutableTargetGenerator.cxx | |
| parent | 800e764e8047e194cb5532b6528104a16f83bd8f (diff) | |
| parent | 373faae5e1c936351b143b0561c61ef9884303e1 (diff) | |
| download | CMake-b0759da303ebf8a49cb840504591c92fd290f419.zip CMake-b0759da303ebf8a49cb840504591c92fd290f419.tar.gz CMake-b0759da303ebf8a49cb840504591c92fd290f419.tar.bz2 | |
Merge topic 'framework-refactor'
373faae Refactor how bundles and frameworks are supported.
Diffstat (limited to 'Source/cmMakefileExecutableTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index b7a454b..e4219a9 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -30,11 +30,8 @@ cmMakefileExecutableTargetGenerator this->TargetNamePDB, this->ConfigName); this->OSXBundleGenerator = new cmOSXBundleGenerator(this->Target, - this->TargetNameOut, this->ConfigName); this->OSXBundleGenerator->SetMacContentFolders(&this->MacContentFolders); - this->MacContentDirectory = - this->OSXBundleGenerator->GetMacContentDirectory(); } //---------------------------------------------------------------------------- @@ -103,11 +100,11 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) // Construct the full path version of the names. std::string outpath = this->Target->GetDirectory(this->ConfigName); - outpath += "/"; if(this->Target->IsAppBundleOnApple()) { this->OSXBundleGenerator->CreateAppBundle(targetName, outpath); } + outpath += "/"; std::string outpathImp; if(relink) { |