summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Blechmann <tim@klingt.org>2014-03-25 15:16:51 (GMT)
committerBrad King <brad.king@kitware.com>2014-04-22 16:48:44 (GMT)
commit149ce5db5ed52855514e3ee3eef45295e667eed4 (patch)
treeca9cdad0c71fde7484286c81e95c8e9b2e564fb7
parente40fbbb0744e63401cba0958155c14fa838477cb (diff)
downloadCMake-149ce5db5ed52855514e3ee3eef45295e667eed4.zip
CMake-149ce5db5ed52855514e3ee3eef45295e667eed4.tar.gz
CMake-149ce5db5ed52855514e3ee3eef45295e667eed4.tar.bz2
OS X: Fix Info.plist placement in a CFBundle
Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the same root directory as the rest of the bundle. Without this, Info.plist was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because the target path was not generated correctly.
-rw-r--r--Source/cmOSXBundleGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 9a340dc..448d77c 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -178,7 +178,7 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName,
// Configure the Info.plist file. Note that it needs the executable name
// to be set.
- std::string plist =
+ std::string plist = root + "/" +
this->Target->GetCFBundleDirectory(this->ConfigName, true);
plist += "/Info.plist";
this->LocalGenerator->GenerateAppleInfoPList(this->Target,