summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-07-03 13:28:49 -0400
committerBrad King <brad.king@kitware.com>2008-07-03 13:28:49 -0400
commit264af17bfcb78cd08c1f5542269cc74dd733b714 (patch)
tree3f146ae168929bea4416ac4ba20fee69532601f2 /Source
parent7950b99d9dd10a1aeb59deb61a0bb4d290c4596e (diff)
downloadcmake-264af17bfcb78cd08c1f5542269cc74dd733b714.tar.gz
BUG: Fix Xcode per-config bundle name in Info.plist
- The Xcode generator creates one Info.plist input file which is converted at build time by Xcode and placed in the final bundle. - The <CONFIG>_OUTPUT_NAME target property can place different content for the exe name in Info.plist on a per-configuration basis. - Instead of generating a per-config Info.plist input file just let Xcode put the name in at build time using the $(EXECUTABLE_NAME) var.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d00a19a73f..2381bc1c14 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1480,8 +1480,12 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
plist += "/";
plist += target.GetName();
plist += "Info.plist";
+ // Xcode will create the final version of Info.plist at build time,
+ // so let it replace the executable name. This avoids creating
+ // a per-configuration Info.plist file.
this->CurrentLocalGenerator
- ->GenerateAppleInfoPList(&target, productName.c_str(), plist.c_str());
+ ->GenerateAppleInfoPList(&target, "$(EXECUTABLE_NAME)",
+ plist.c_str());
std::string path =
this->ConvertToRelativeForXCode(plist.c_str());
buildSettings->AddAttribute("INFOPLIST_FILE",