[Cmake-commits] CMake branch, next, updated. v2.8.3-970-gc1914d3

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c1914d3c03e91a18f5ad3b9e8811027c9e4d0981 (commit)
       via  f7d525e3a679d6fef40e3b5f9345201a85362f44 (commit)
      from  9baa75f65818907fd3c0104701545d106b337f48 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1914d3c03e91a18f5ad3b9e8811027c9e4d0981
commit c1914d3c03e91a18f5ad3b9e8811027c9e4d0981
Merge: 9baa75f f7d525e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 17 09:11:49 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 17 09:11:49 2010 -0500

    Merge topic 'xcode-version-3.2' into next
    
    f7d525e Xcode: Generate native 3.2 projects


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7d525e3a679d6fef40e3b5f9345201a85362f44
commit f7d525e3a679d6fef40e3b5f9345201a85362f44
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 17 08:41:32 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 17 08:41:32 2010 -0500

    Xcode: Generate native 3.2 projects
    
    Set objectVersion = 46; compatibilityVersion = "Xcode 3.2" when
    Xcode 3.2 is detected.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 29c2d06..cc6c686 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2636,7 +2636,10 @@ void cmGlobalXCodeGenerator
     group->AddAttribute("BuildIndependentTargetsInParallel",
                         this->CreateString("YES"));
     this->RootObject->AddAttribute("attributes", group);
-    if (this->XcodeVersion >= 31)
+    if (this->XcodeVersion >= 32)
+      this->RootObject->AddAttribute("compatibilityVersion",
+                                     this->CreateString("Xcode 3.2"));
+    else if (this->XcodeVersion >= 31)
       this->RootObject->AddAttribute("compatibilityVersion",
                                      this->CreateString("Xcode 3.1"));
     else
@@ -3042,7 +3045,9 @@ cmGlobalXCodeGenerator::WriteXCodePBXProj(std::ostream& fout,
   cmXCodeObject::Indent(1, fout);
   if(this->XcodeVersion >= 21)
     {
-    if (this->XcodeVersion >= 31)
+    if (this->XcodeVersion >= 32)
+      fout << "objectVersion = 46;\n";
+    else if (this->XcodeVersion >= 31)
       fout << "objectVersion = 45;\n";
     else if (this->XcodeVersion >= 30)
       fout << "objectVersion = 44;\n";

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake