diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 05c684895..1ce274d41 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2758,6 +2758,21 @@ void cmGlobalXCodeGenerator
                                 this->CreateString(deploymentTarget));
     }
 
+  // put this last so it can override existing settings
+  // Convert "CMAKE_XCODE_ATTRIBUTE_*" properties directly.
+  {
+    std::vector<std::string> vars = this->CurrentMakefile->GetDefinitions();
+    for(std::vector<std::string>::const_iterator i = vars.begin();
+        i != vars.end(); ++i)
+    {
+      if(i->find("CMAKE_XCODE_ATTRIBUTE_") == 0)
+      {
+        buildSettings->AddAttribute(i->substr(22).c_str(),
+          this->CreateString(this->CurrentMakefile->GetDefinition(i->c_str())));
+      }
+    }
+  }
+
   std::string symroot = root->GetMakefile()->GetCurrentOutputDirectory();
   symroot += "/build";
   buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));