[Cmake-commits] [cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.189 1.190

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv7557/Source

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
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.


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.189
retrieving revision 1.190
diff -C 2 -d -r1.189 -r1.190
*** cmGlobalXCodeGenerator.cxx	6 Jun 2008 15:49:06 -0000	1.189
--- cmGlobalXCodeGenerator.cxx	3 Jul 2008 17:28:49 -0000	1.190
***************
*** 1481,1486 ****
        plist += target.GetName();
        plist += "Info.plist";
        this->CurrentLocalGenerator
!         ->GenerateAppleInfoPList(&target, productName.c_str(), plist.c_str());
        std::string path =
          this->ConvertToRelativeForXCode(plist.c_str());
--- 1481,1490 ----
        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, "$(EXECUTABLE_NAME)",
!                                  plist.c_str());
        std::string path =
          this->ConvertToRelativeForXCode(plist.c_str());