diff options
| author | Brad King <brad.king@kitware.com> | 2012-03-19 18:41:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-19 18:41:43 (GMT) |
| commit | bfc8d137c5ff505717f71099f149cfc2682b76ec (patch) | |
| tree | 7dde1d714033d64c3808f5c295d883a17faae7a1 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 572994bd9f8ea77c3101f0b019b693c37b0d502e (diff) | |
| parent | 0f4dfa6960e51b7460b91f828932a42d5827467a (diff) | |
| download | CMake-bfc8d137c5ff505717f71099f149cfc2682b76ec.zip CMake-bfc8d137c5ff505717f71099f149cfc2682b76ec.tar.gz CMake-bfc8d137c5ff505717f71099f149cfc2682b76ec.tar.bz2 | |
Merge topic 'fix-12621-xcode43'
0f4dfa6 CPack: Use real path to PackageMaker to find its version file (#12621)
4693cf8 Xcode: Detect new default locations of Xcode 4.3 bits and pieces (#12621)
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index e552928..0bbe0a0 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -135,8 +135,17 @@ cmGlobalGenerator* cmGlobalXCodeGenerator::New() { #if defined(CMAKE_BUILD_WITH_CMAKE) cmXcodeVersionParser parser; - parser.ParseFile - ("/Developer/Applications/Xcode.app/Contents/version.plist"); + if (cmSystemTools::FileExists( + "/Applications/Xcode.app/Contents/version.plist")) + { + parser.ParseFile + ("/Applications/Xcode.app/Contents/version.plist"); + } + else + { + parser.ParseFile + ("/Developer/Applications/Xcode.app/Contents/version.plist"); + } cmsys::auto_ptr<cmGlobalXCodeGenerator> gg(new cmGlobalXCodeGenerator(parser.Version)); if (gg->XcodeVersion == 20) |