[Cmake-commits] [cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.215 1.216

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jul 8 13:03:36 EDT 2009


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

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
ENH: Use fixed header file type mapping for Xcode

This simplifies computation of the lastKnownFileType attribute for
header files in Xcode projects.  We now use a fixed mapping from
header file extension to attribute value.  The value is just a hint to
the Xcode editor, so computing the target linker language is overkill.


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.215
retrieving revision 1.216
diff -C 2 -d -r1.215 -r1.216
*** cmGlobalXCodeGenerator.cxx	7 Jul 2009 11:44:08 -0000	1.215
--- cmGlobalXCodeGenerator.cxx	8 Jul 2009 17:03:34 -0000	1.216
***************
*** 634,648 ****
      sourcecode += ".text.plist";
      }
!   else if(ext == "h" || ext == "hxx" || ext == "hpp")
      {
!     const char* linkLanguage = cmtarget.GetLinkerLanguage();
!     if(linkLanguage && (std::string(linkLanguage) == "CXX"))
!       {
!       sourcecode += ".cpp.h";
!       }
!     else
!       {
!       sourcecode += ".c.h";
!       }
      }
    else if(lang && strcmp(lang, "CXX") == 0)
--- 634,644 ----
      sourcecode += ".text.plist";
      }
!   else if(ext == "h")
      {
!     sourcecode += ".c.h";
!     }
!   else if(ext == "hxx" || ext == "hpp" || ext == "txx")
!     {
!     sourcecode += ".cpp.h";
      }
    else if(lang && strcmp(lang, "CXX") == 0)



More information about the Cmake-commits mailing list