diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-20 14:55:11 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-20 10:55:27 -0400 |
| commit | a9fb9a8774a7b1dd411542d1d14fb537968e32f1 (patch) | |
| tree | 2d74dc351b298a5317d05634170c91a8b43bc07e /Auxiliary | |
| parent | 28ee31149030c75c32ebbf134502a9d020dbd54b (diff) | |
| parent | a9180ccf9a9e845658ba455e2dbc2447b18d2654 (diff) | |
| download | cmake-a9fb9a8774a7b1dd411542d1d14fb537968e32f1.tar.gz | |
Merge topic 'ninja-swift'
a9180ccf9a Tests: add a check for the Swift compiler
d745551fb6 Help: add some initial documentation for Swift support
9a182c9e5b Auxiliary: update vim syntax highlighting
e9b0063e8e Modules: add build rules for Swift Ninja support
b6412e3e38 Ninja: add placeholders to support Swift build
7d7f31161d Ninja: add support for Swift's output-file-map.json
d688c4c19d Swift: remove unnecessary unreleased Ninja infrastructure
0723582208 Swift: Detect compiler version
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3297
Diffstat (limited to 'Auxiliary')
| -rw-r--r-- | Auxiliary/vim/syntax/cmake.vim | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Auxiliary/vim/syntax/cmake.vim b/Auxiliary/vim/syntax/cmake.vim index fa4f60a0a1..877a033afe 100644 --- a/Auxiliary/vim/syntax/cmake.vim +++ b/Auxiliary/vim/syntax/cmake.vim @@ -96,6 +96,7 @@ syn keyword cmakeProperty contained \ CMAKE_CONFIGURE_DEPENDS \ CMAKE_CXX_KNOWN_FEATURES \ CMAKE_C_KNOWN_FEATURES + \ CMAKE_Swift_MODULE_DIRECTORY \ COMMON_LANGUAGE_RUNTIME \ COMPATIBLE_INTERFACE_BOOL \ COMPATIBLE_INTERFACE_NUMBER_MAX @@ -287,6 +288,11 @@ syn keyword cmakeProperty contained \ STRINGS \ SUBDIRECTORIES \ SUFFIX + \ Swift_DEPENDENCIES_FILE + \ Swift_DIAGNOSTICS_FILE + \ Swift_MODULE + \ Swift_MODULE_DIRECTORY + \ Swift_MODULE_NAME \ SYMBOLIC \ TARGET_ARCHIVES_MAY_BE_SHARED_LIBS \ TARGET_MESSAGES |