[Cmake-commits] [cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.211 1.212

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
ENH: Use logical target names in Xcode projects

Previously we named Xcode targets using the output file name from one of the
configurations.  This is not very friendly, especially because it changes with
CMAKE_BUILD_TYPE.  Instead we should use the original logical target names for
the Xcode target names.  This is also consistent with the way the other IDE
generators work.


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.211
retrieving revision 1.212
diff -C 2 -d -r1.211 -r1.212
*** cmGlobalXCodeGenerator.cxx	29 Jun 2009 17:02:05 -0000	1.211
--- cmGlobalXCodeGenerator.cxx	2 Jul 2009 18:13:12 -0000	1.212
***************
*** 1889,1894 ****
      this->CreateObject(cmXCodeObject::OBJECT_LIST);
    target->AddAttribute("dependencies", dependencies);
!   target->AddAttribute("name", this->CreateString(productName.c_str()));
!   target->AddAttribute("productName",this->CreateString(productName.c_str()));
    target->SetTarget(&cmtarget);
  
--- 1889,1894 ----
      this->CreateObject(cmXCodeObject::OBJECT_LIST);
    target->AddAttribute("dependencies", dependencies);
!   target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
!   target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
    target->SetTarget(&cmtarget);
  
***************
*** 1991,1996 ****
      this->CreateObject(cmXCodeObject::OBJECT_LIST);
    target->AddAttribute("dependencies", dependencies);
!   target->AddAttribute("name", this->CreateString(productName.c_str()));
!   target->AddAttribute("productName",this->CreateString(productName.c_str()));
  
    cmXCodeObject* fileRef = 
--- 1991,1996 ----
      this->CreateObject(cmXCodeObject::OBJECT_LIST);
    target->AddAttribute("dependencies", dependencies);
!   target->AddAttribute("name", this->CreateString(cmtarget.GetName()));
!   target->AddAttribute("productName",this->CreateString(cmtarget.GetName()));
  
    cmXCodeObject* fileRef = 
***************
*** 2801,2805 ****
            universal += configName;
            universal += "/";
!           universal += t->GetFullName(configName);
            universal += ".build/Objects-normal/";
            for( std::vector<std::string>::iterator arch = 
--- 2801,2805 ----
            universal += configName;
            universal += "/";
!           universal += t->GetName();
            universal += ".build/Objects-normal/";
            for( std::vector<std::string>::iterator arch = 
***************
*** 2954,2974 ****
    dir += this->GetCMakeCFGInitDirectory();
    dir += "/";
-   if(target->GetType() != cmTarget::EXECUTABLE)
-     {
-     dir += "lib";
-     }
    dir += target->GetName();
-   if(target->GetType() == cmTarget::STATIC_LIBRARY)
-     {
-     dir += ".a";
-     }
-   if(target->GetType() == cmTarget::SHARED_LIBRARY)
-     {
-     dir += ".dylib";
-     }
-   if(target->GetType() == cmTarget::MODULE_LIBRARY)
-     {
-     dir += ".so";
-     }
    dir += ".build/Objects-normal/";
    std::string dirsave = dir;
--- 2954,2958 ----