[Cmake-commits] [cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.231 1.232

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
Add Xcode SYMROOT setting for custom targets

Xcode 1.5 writes helper scripts at the projectDirPath location for
targets that do not set SYMROOT.  We now add SYMROOT to custom targets
so that all targets set it.  This prevents Xcode 1.5 from touching the
source directory now that we always set projectDirPath.

See issue #8481.


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.231
retrieving revision 1.232
diff -C 2 -d -r1.231 -r1.232
*** cmGlobalXCodeGenerator.cxx	23 Sep 2009 12:48:37 -0000	1.231
--- cmGlobalXCodeGenerator.cxx	23 Sep 2009 18:10:08 -0000	1.232
***************
*** 1532,1535 ****
--- 1532,1536 ----
  
    // Set attributes to specify the proper name for the target.
+   std::string pndir = this->CurrentMakefile->GetCurrentOutputDirectory();
    if(target.GetType() == cmTarget::STATIC_LIBRARY ||
       target.GetType() == cmTarget::SHARED_LIBRARY ||
***************
*** 1537,1543 ****
       target.GetType() == cmTarget::EXECUTABLE)
      {
!     std::string pndir = target.GetDirectory();
!     buildSettings->AddAttribute("SYMROOT", 
!                                 this->CreateString(pndir.c_str()));
      buildSettings->AddAttribute("EXECUTABLE_PREFIX", 
                                  this->CreateString(pnprefix.c_str()));
--- 1538,1542 ----
       target.GetType() == cmTarget::EXECUTABLE)
      {
!     pndir = target.GetDirectory();
      buildSettings->AddAttribute("EXECUTABLE_PREFIX", 
                                  this->CreateString(pnprefix.c_str()));
***************
*** 1545,1548 ****
--- 1544,1549 ----
                                  this->CreateString(pnsuffix.c_str()));
      }
+   buildSettings->AddAttribute("SYMROOT",
+                               this->CreateString(pndir.c_str()));
  
    // Handle settings for each target type.