diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-05 12:29:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-05 12:29:59 (GMT) |
| commit | 25e616862dac08aae7c4a3ad01839acfe7342ec7 (patch) | |
| tree | 482423c7c33ac3fd881f26047392abcf62f245f1 /Source | |
| parent | 762a41fd19dff29de41009bfe7bcf69917e5ffb0 (diff) | |
| parent | 96dece6dc11627d0e7b5588f63f2578b581cfb77 (diff) | |
| download | CMake-25e616862dac08aae7c4a3ad01839acfe7342ec7.zip CMake-25e616862dac08aae7c4a3ad01839acfe7342ec7.tar.gz CMake-25e616862dac08aae7c4a3ad01839acfe7342ec7.tar.bz2 | |
Merge topic 'swift-xcode-10.2'
96dece6dc1 Xcode: Update default Swift language version for Xcode 10.2
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2912
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index b428ae1..16f8a0e 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -3142,6 +3142,8 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects( if (const char* vers = this->CurrentMakefile->GetDefinition( "CMAKE_Swift_LANGUAGE_VERSION")) { swiftVersion = vers; + } else if (this->XcodeVersion >= 102) { + swiftVersion = "4.0"; } else if (this->XcodeVersion >= 83) { swiftVersion = "3.0"; } else { |