diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-03 13:26:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-03 13:27:39 (GMT) |
| commit | d615ce4386f98cfac4d90e136cb272ec2d635e15 (patch) | |
| tree | 8bdd16a2275df1f9b2f69215d7b729cd1b491b55 /Modules | |
| parent | c1dbbef2395847d9b68e4c7871f97066bdbad3a3 (diff) | |
| parent | 5c028c27eb807e22f7d6095da4d9b694487ede05 (diff) | |
| download | CMake-d615ce4386f98cfac4d90e136cb272ec2d635e15.zip CMake-d615ce4386f98cfac4d90e136cb272ec2d635e15.tar.gz CMake-d615ce4386f98cfac4d90e136cb272ec2d635e15.tar.bz2 | |
Merge topic 'xcode11-swift'
5c028c27eb Xcode: Relax swift compiler detection regex for Xcode 11
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3758
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineSwiftCompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineSwiftCompiler.cmake b/Modules/CMakeDetermineSwiftCompiler.cmake index 2fcf7b0..9aafe48 100644 --- a/Modules/CMakeDetermineSwiftCompiler.cmake +++ b/Modules/CMakeDetermineSwiftCompiler.cmake @@ -53,7 +53,7 @@ if(NOT CMAKE_Swift_COMPILER_ID_RUN) list(APPEND CMAKE_Swift_COMPILER_ID_MATCH_VENDORS Apple) set(CMAKE_Swift_COMPILER_ID_MATCH_VENDOR_REGEX_Apple "com.apple.xcode.tools.swift.compiler") - set(CMAKE_Swift_COMPILER_ID_TOOL_MATCH_REGEX "\nCompileSwiftSources[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]* -c[^\r\n]*CompilerIdSwift/CompilerId/main.swift") + set(CMAKE_Swift_COMPILER_ID_TOOL_MATCH_REGEX "\nCompileSwift[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]* -c[^\r\n]*CompilerIdSwift/CompilerId/main.swift") set(CMAKE_Swift_COMPILER_ID_TOOL_MATCH_INDEX 2) endif() |