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 /Modules | |
| 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 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 2a0dbd3..cdbaea6 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -332,6 +332,8 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} if("${lang}" STREQUAL "Swift") if(CMAKE_Swift_LANGUAGE_VERSION) set(id_lang_version "SWIFT_VERSION = ${CMAKE_Swift_LANGUAGE_VERSION};") + elseif(XCODE_VERSION VERSION_GREATER_EQUAL 10.2) + set(id_lang_version "SWIFT_VERSION = 4.0;") elseif(XCODE_VERSION VERSION_GREATER_EQUAL 8.3) set(id_lang_version "SWIFT_VERSION = 3.0;") else() |