diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-21 18:59:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-21 18:59:28 (GMT) |
| commit | 27b86ece8f400ed7a4f9093e9ba11d63dc8929b8 (patch) | |
| tree | 894463ac73ea9129bc1c22218535df70a2b70d0e | |
| parent | ccc790f1601469bf09193970759f5c09d8c18601 (diff) | |
| parent | f7d525e3a679d6fef40e3b5f9345201a85362f44 (diff) | |
| download | CMake-27b86ece8f400ed7a4f9093e9ba11d63dc8929b8.zip CMake-27b86ece8f400ed7a4f9093e9ba11d63dc8929b8.tar.gz CMake-27b86ece8f400ed7a4f9093e9ba11d63dc8929b8.tar.bz2 | |
Merge topic 'xcode-version-3.2'
f7d525e Xcode: Generate native 3.2 projects
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
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"; |