diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-26 13:06:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-26 13:06:29 (GMT) |
| commit | c6f07d06c610a9b1e6062d70ffc78c04bdf48ee4 (patch) | |
| tree | 15a6961de923535d8695806223cec28cf8078388 /Modules | |
| parent | d57a6493fc667f8a6ffa9fad2566a0cbea785ec5 (diff) | |
| parent | b35568f3f9f9b8f4b5b2a2e6f4d524540980c3ae (diff) | |
| download | CMake-c6f07d06c610a9b1e6062d70ffc78c04bdf48ee4.zip CMake-c6f07d06c610a9b1e6062d70ffc78c04bdf48ee4.tar.gz CMake-c6f07d06c610a9b1e6062d70ffc78c04bdf48ee4.tar.bz2 | |
Merge topic 'xcode-swift-version'
b35568f3 Xcode: Add option to set Swift language version
49d50ad4 Xcode: Port rudimentary Swift support to Xcode 8
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 5 | ||||
| -rw-r--r-- | Modules/CompilerId/Xcode-3.pbxproj.in | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 64d9bed..3d1ca6d 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -266,6 +266,11 @@ Id flags: ${testflags} else() set(id_toolset "") endif() + if("${lang}" STREQUAL "Swift") + set(id_lang_version "SWIFT_VERSION = 2.3;") + else() + set(id_lang_version "") + endif() if(CMAKE_OSX_DEPLOYMENT_TARGET) set(id_deployment_target "MACOSX_DEPLOYMENT_TARGET = \"${CMAKE_OSX_DEPLOYMENT_TARGET}\";") diff --git a/Modules/CompilerId/Xcode-3.pbxproj.in b/Modules/CompilerId/Xcode-3.pbxproj.in index 20f3da3..22ad4f6 100644 --- a/Modules/CompilerId/Xcode-3.pbxproj.in +++ b/Modules/CompilerId/Xcode-3.pbxproj.in @@ -84,6 +84,7 @@ CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; SYMROOT = .; @id_toolset@ + @id_lang_version@ @id_deployment_target@ @id_sdkroot@ }; |