[Cmake-commits] [cmake-commits] hoffman committed cmGlobalXCodeGenerator.cxx 1.201 1.202

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
BUG: 7763 fix, OPTIMIZATION was not set right.  Also fix for BUG 7764, put XCODE_ATTRIBUTES_ last 


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.201
retrieving revision 1.202
diff -C 2 -d -r1.201 -r1.202
*** cmGlobalXCodeGenerator.cxx	15 Sep 2008 13:51:47 -0000	1.201
--- cmGlobalXCodeGenerator.cxx	2 Oct 2008 17:49:32 -0000	1.202
***************
*** 1619,1642 ****
      }    
  
-   // Convert "XCODE_ATTRIBUTE_*" properties directly.
-   {
-   cmPropertyMap const& props = target.GetProperties();
-   for(cmPropertyMap::const_iterator i = props.begin();
-       i != props.end(); ++i)
-     {
-     if(i->first.find("XCODE_ATTRIBUTE_") == 0)
-       {
-       buildSettings->AddAttribute(i->first.substr(16).c_str(),
-                                   this->CreateString(i->second.GetValue()));
-       }
-     }
-   }
- 
    buildSettings->AddAttribute("GCC_GENERATE_DEBUGGING_SYMBOLS",
                                this->CreateString(debugStr));
    buildSettings->AddAttribute("GCC_OPTIMIZATION_LEVEL", 
                                this->CreateString(optLevel));
-   buildSettings->AddAttribute("OPTIMIZATION_CFLAGS", 
-                               this->CreateString(oflagc.c_str()));
    buildSettings->AddAttribute("GCC_SYMBOLS_PRIVATE_EXTERN",
                                this->CreateString("NO"));
--- 1619,1626 ----
***************
*** 1731,1734 ****
--- 1715,1732 ----
                                  this->CreateString(vso.str().c_str()));
      }
+   // put this last so it can override existing settings
+   // Convert "XCODE_ATTRIBUTE_*" properties directly.
+   {
+   cmPropertyMap const& props = target.GetProperties();
+   for(cmPropertyMap::const_iterator i = props.begin();
+       i != props.end(); ++i)
+     {
+     if(i->first.find("XCODE_ATTRIBUTE_") == 0)
+       {
+       buildSettings->AddAttribute(i->first.substr(16).c_str(),
+                                   this->CreateString(i->second.GetValue()));
+       }
+     }
+   }
  }