diff --git a/data/generators/cmake.xml.tpl b/data/generators/cmake.xml.tpl
--- a/data/generators/cmake.xml.tpl
+++ b/data/generators/cmake.xml.tpl
@@ -31,7 +31,7 @@
 
 <language
     name="CMake"
-    version="16"
+    version="17"
     kateversion="2.4"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"
diff --git a/data/generators/cmake.yaml b/data/generators/cmake.yaml
--- a/data/generators/cmake.yaml
+++ b/data/generators/cmake.yaml
@@ -111,6 +111,7 @@
     - AUTOMOC_EXECUTABLE                                    # Since 3.14
     - AUTOMOC_MACRO_NAMES
     - AUTOMOC_MOC_OPTIONS                                   # Since ???
+    - AUTOMOC_PATH_PREFIX                                   # Since 3.16
     - AUTOMOC
     - AUTOUIC
     - AUTOUIC_EXECUTABLE                                    # Since 3.14
@@ -148,6 +149,7 @@
     - CUDA_PTX_COMPILATION
     - CUDA_SEPARABLE_COMPILATION
     - CUDA_RESOLVE_DEVICE_SYMBOLS
+    - CUDA_RESOLVE_DEVICE_SYMBOLS                           # Since 3.16
     - CUDA_EXTENSIONS
     - CUDA_STANDARD
     - CUDA_STANDARD_REQUIRED
@@ -158,6 +160,7 @@
     - DEFINE_SYMBOL
     - DEPLOYMENT_ADDITIONAL_FILES                           # Since 3.13
     - DEPLOYMENT_REMOTE_DIRECTORY
+    - DISABLE_PRECOMPILE_HEADERS                            # Since 3.16
     - DOTNET_TARGET_FRAMEWORK_VERSION                       # Since 3.12
     - EchoString
     - ENABLE_EXPORTS
@@ -203,6 +206,7 @@
     - IMPORT_SUFFIX
     - INCLUDE_DIRECTORIES
     - INSTALL_NAME_DIR
+    - INSTALL_REMOVE_ENVIRONMENT_RPATH                      # Since 3.16
     - INSTALL_RPATH
     - INSTALL_RPATH_USE_LINK_PATH
     - INTERFACE_AUTOUIC_OPTIONS
@@ -214,6 +218,7 @@
     - INTERFACE_LINK_DIRECTORIES                            # Since 3.13
     - INTERFACE_LINK_LIBRARIES
     - INTERFACE_LINK_OPTIONS                                # Since 3.13
+    - INTERFACE_PRECOMPILE_HEADERS                          # Since 3.16
     - INTERFACE_POSITION_INDEPENDENT_CODE
     - INTERFACE_SOURCES
     - INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
@@ -269,6 +274,8 @@
     - PDB_OUTPUT_DIRECTORY_<CONFIG>
     - PDB_OUTPUT_DIRECTORY
     - POSITION_INDEPENDENT_CODE
+    - PRECOMPILE_HEADERS                                    # Since 3.16
+    - PRECOMPILE_HEADERS_REUSE_FROM                         # Since 3.16
     - PREFIX
     - PRIVATE_HEADER
     - PROJECT_LABEL
@@ -293,6 +300,10 @@
     - Swift_MODULE_DIRECTORY                                # Since 3.15
     - Swift_MODULE_NAME                                     # Since 3.15
     - TYPE
+    - UNITY_BUILD                                           # Since 3.16
+    - UNITY_BUILD_BATCH_SIZE                                # Since 3.16
+    - UNITY_BUILD_CODE_AFTER_INCLUDE                        # Since 3.16
+    - UNITY_BUILD_CODE_BEFORE_INCLUDE                       # Since 3.16
     - VERSION
     - VISIBILITY_INLINES_HIDDEN
     - VS_CONFIGURATION_TYPE
@@ -306,6 +317,7 @@
     - VS_DOTNET_REFERENCES
     - VS_DOTNET_REFERENCES_COPY_LOCAL
     - VS_DOTNET_TARGET_FRAMEWORK_VERSION
+    - VS_DPI_AWARE                                          # Since 3.16
     - VS_GLOBAL_KEYWORD
     - VS_GLOBAL_PROJECT_TYPES
     - VS_GLOBAL_ROOTNAMESPACE
@@ -339,6 +351,7 @@
     - XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN       # Since 3.13
     - XCODE_SCHEME_ARGUMENTS                                # Since 3.13
     - XCODE_SCHEME_DEBUG_AS_ROOT                            # Since 3.15
+    - XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING                # Since 3.16
     - XCODE_SCHEME_THREAD_SANITIZER                         # Since 3.13
     - XCODE_SCHEME_THREAD_SANITIZER_STOP                    # Since 3.13
     - XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER            # Since 3.13
@@ -375,6 +388,7 @@
     - REQUIRED_FILES
     - RESOURCE_LOCK
     - RUN_SERIAL
+    - SKIP_REGULAR_EXPRESSION                               # Since 3.16
     - SKIP_RETURN_CODE
     - TIMEOUT
     - TIMEOUT_AFTER_MATCH
@@ -404,6 +418,8 @@
     - SKIP_AUTOMOC
     - SKIP_AUTORCC
     - SKIP_AUTOUIC
+    - SKIP_PRECOMPILE_HEADERS                               # Since 3.16
+    - SKIP_UNITY_BUILD_INCLUSION                            # Since 3.16
     - Swift_DEPENDENCIES_FILE                               # Since 3.15
     - Swift_DIAGNOSTICS_FILE                                # Since 3.15
     - SYMBOLIC
@@ -580,6 +596,7 @@
     - CMAKE_MAKE_PROGRAM
     - CMAKE_MATCH_COUNT
     - CMAKE_MATCH_<n>
+    - CMAKE_MESSAGE_INDENT                                  # Since 3.16
     - CMAKE_MINIMUM_REQUIRED_VERSION
     - CMAKE_MINOR_VERSION
     - CMAKE_NETRC                                           # Since 3.11
@@ -658,6 +675,7 @@
     - CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES
     - CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT
     - CMAKE_ECLIPSE_MAKE_ARGUMENTS
+    - CMAKE_ECLIPSE_RESOURCE_ENCODING                       # Since 3.16
     - CMAKE_ECLIPSE_VERSION
     - CMAKE_ERROR_DEPRECATED
     - CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION
@@ -671,7 +689,7 @@
     - CMAKE_FIND_LIBRARY_PREFIXES
     - CMAKE_FIND_LIBRARY_SUFFIXES
     - CMAKE_FIND_NO_INSTALL_PREFIX
-    - CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY
+    - CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY                # Deprecated since 3.16
     - CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY
     - CMAKE_FIND_PACKAGE_PREFER_CONFIG                      # Since 3.15
     - CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS                   # Since 3.14
@@ -681,6 +699,12 @@
     - CMAKE_FIND_ROOT_PATH_MODE_LIBRARY
     - CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
     - CMAKE_FIND_ROOT_PATH_MODE_PROGRAM
+    - CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH                 # Since 3.16
+    - CMAKE_FIND_USE_CMAKE_PATH                             # Since 3.16
+    - CMAKE_FIND_USE_CMAKE_SYSTEM_PATH                      # Since 3.16
+    - CMAKE_FIND_USE_PACKAGE_ROOT_PATH                      # Since 3.16
+    - CMAKE_FIND_USE_PACKAGE_REGISTRY                       # Since 3.16
+    - CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH                # Since 3.16
     - CMAKE_FRAMEWORK_PATH
     - CMAKE_IGNORE_PATH
     - CMAKE_INCLUDE_DIRECTORIES_BEFORE
@@ -729,6 +753,7 @@
     - CMAKE_XCODE_SCHEME_THREAD_SANITIZER_STOP              # Since 3.13
     - CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER      # Since 3.13
     - CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP # Since 3.13
+    - CMAKE_XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING          # Since 3.16
     - CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER        # Since 3.13
     - CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP           # Since 3.13
     - CMAKE_XCODE_SCHEME_MALLOC_SCRIBBLE                    # Since 3.13
@@ -820,6 +845,7 @@
     - CMAKE_AUTOMOC
     - CMAKE_AUTOMOC_DEPEND_FILTERS
     - CMAKE_AUTOMOC_MOC_OPTIONS
+    - CMAKE_AUTOMOC_PATH_PREFIX                             # Since 3.16
     - CMAKE_AUTORCC
     - CMAKE_AUTORCC_OPTIONS
     - CMAKE_AUTOUIC
@@ -833,6 +859,7 @@
     - CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG>
     - CMAKE_<CONFIG>_POSTFIX
     - CMAKE_CUDA_SEPARABLE_COMPILATION                      # Since 3.11
+    - CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS                     # Since 3.16
     - CMAKE_DEBUG_POSTFIX
     - CMAKE_ENABLE_EXPORTS
     - CMAKE_EXE_LINKER_FLAGS
@@ -851,6 +878,7 @@
     - CMAKE_INCLUDE_CURRENT_DIR
     - CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE
     - CMAKE_INSTALL_NAME_DIR
+    - CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH                # Since 3.16
     - CMAKE_INSTALL_RPATH
     - CMAKE_INSTALL_RPATH_USE_LINK_PATH
     - CMAKE_INTERPROCEDURAL_OPTIMIZATION
@@ -904,6 +932,8 @@
     - CMAKE_TRY_COMPILE_CONFIGURATION
     - CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
     - CMAKE_TRY_COMPILE_TARGET_TYPE
+    - CMAKE_UNITY_BUILD                                     # Since 3.16
+    - CMAKE_UNITY_BUILD_BATCH_SIZE                          # Since 3.16
     - CMAKE_USE_RELATIVE_PATHS
     - CMAKE_VISIBILITY_INLINES_HIDDEN
     - CMAKE_VS_GLOBALS                                      # Since 3.13
@@ -1072,7 +1102,8 @@
     - CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION
     - CPACK_INCLUDE_TOPLEVEL_DIRECTORY
     - CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS           # Since 3.11
-    - CPACK_INSTALL_SCRIPT
+    - CPACK_INSTALL_SCRIPT                                  # Deprecated since 3.16
+    - CPACK_INSTALL_SCRIPTS                                 # Since 3.16
     - CPACK_PACKAGING_INSTALL_PREFIX
     - CPACK_SET_DESTDIR
     - CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION
@@ -1201,7 +1232,7 @@
     - CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS
     - CPACK_DEBIAN_PACKAGE_MAINTAINER
     - CPACK_DEBIAN_PACKAGE_DESCRIPTION
-    - CPACK_COMPONENT_<COMPONENT>_DESCRIPTION
+    - CPACK_DEBIAN_<COMPONENT>_DESCRIPTION                  # Since 3.16
     - CPACK_DEBIAN_PACKAGE_SECTION
     - CPACK_DEBIAN_<COMPONENT>_PACKAGE_SECTION
     - CPACK_DEBIAN_ARCHIVE_TYPE
@@ -1457,8 +1488,6 @@
     # - CPack
     - CPACK_PACKAGE_NAME
     - CPACK_PACKAGE_VENDOR
-      # `CPACK_PACKAGE_CONTACT` used by some modules (like Deb and NSIS),
-      # but not documented yet...
     - CPACK_PACKAGE_CONTACT
     - CPACK_PACKAGE_DIRECTORY
     - CPACK_PACKAGE_VERSION_MAJOR
@@ -1488,6 +1517,7 @@
     - CPACK_SOURCE_OUTPUT_CONFIG_FILE
     - CPACK_SOURCE_IGNORE_FILES
     - CPACK_CMAKE_GENERATOR
+    - CPACK_INSTALL_CMAKE_CONFIGURATIONS                    # Since 3.16
     - CPACK_INSTALL_CMAKE_PROJECTS
     - CPACK_SYSTEM_NAME
     - CPACK_PACKAGE_VERSION
@@ -1497,6 +1527,12 @@
     - CPACK_PACKAGE_INSTALL_REGISTRY_KEY
     - CPACK_CREATE_DESKTOP_LINKS
     - CPACK_BINARY_<GENNAME>
+    # The following variables used by CPack and some CMake modules,
+    # but not documented (yet):
+    # used by some modules like Deb and NSIS
+    - CPACK_PACKAGE_CONTACT
+    # - used in CPack.cmake as default value for `CPACK_RPM_PACKAGE_RELOCATABLE`
+    - CPACK_PACKAGE_RELOCATABLE
     # - CPackWIX
     - CPACK_WIX_UPGRADE_GUID
     - CPACK_WIX_PRODUCT_GUID
@@ -1554,6 +1590,7 @@
     - PKG_CONFIG_EXECUTABLE
     - PKG_CONFIG_VERSION_STRING
     - PKG_CONFIG_USE_CMAKE_PREFIX_PATH
+    - <prefix>_MODULE_NAME                                  # Since 3.16
     # - FindThreads
     - CMAKE_THREAD_LIBS_INIT
     - CMAKE_USE_SPROC_INIT
@@ -1897,6 +1934,8 @@
             # New sub-options since 3.14
           , READ_SYMLINK
           , SIZE
+            # New sub-options since 3.16
+          , GET_RUNTIME_DEPENDENCIES
           ]
         special-args: [
             UTF-8
@@ -2270,7 +2309,7 @@
         named-args: [EXCLUDE_FROM_ALL]
     -
         name: add_test
-        named-args: [NAME, COMMAND, CONFIGURATIONS, WORKING_DIRECTORY]
+        named-args: [NAME, COMMAND, COMMAND_EXPAND_LISTS, CONFIGURATIONS, WORKING_DIRECTORY]
         nested-parentheses?: true
     -
         name: aux_source_directory
@@ -2508,6 +2547,10 @@
     -
         name: target_link_options
         named-args: *target_compile_definitions
+    -
+        # Since 3.16
+        name: target_precompile_headers
+        named-args: [INTERFACE, PUBLIC, PRIVATE, REUSE_FROM]
     -
         name: target_sources
         named-args: *target_compile_definitions
diff --git a/data/syntax/cmake.xml b/data/syntax/cmake.xml
--- a/data/syntax/cmake.xml
+++ b/data/syntax/cmake.xml
@@ -31,7 +31,7 @@
 
 <language
     name="CMake"
-    version="16"
+    version="17"
     kateversion="2.4"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"
@@ -133,6 +133,7 @@
         <item>target_link_directories</item>
         <item>target_link_libraries</item>
         <item>target_link_options</item>
+        <item>target_precompile_headers</item>
         <item>target_sources</item>
         <item>try_compile</item>
         <item>try_run</item>
@@ -292,6 +293,7 @@
       <item>FOLLOW_SYMLINKS</item>
       <item>FOLLOW_SYMLINK_CHAIN</item>
       <item>GENERATE</item>
+      <item>GET_RUNTIME_DEPENDENCIES</item>
       <item>GLOB</item>
       <item>GLOB_RECURSE</item>
       <item>GUARD</item>
@@ -800,6 +802,7 @@
     </list>
     <list name="add_test_nargs">
       <item>COMMAND</item>
+      <item>COMMAND_EXPAND_LISTS</item>
       <item>CONFIGURATIONS</item>
       <item>NAME</item>
       <item>WORKING_DIRECTORY</item>
@@ -1060,6 +1063,12 @@
       <item>PRIVATE</item>
       <item>PUBLIC</item>
     </list>
+    <list name="target_precompile_headers_nargs">
+      <item>INTERFACE</item>
+      <item>PRIVATE</item>
+      <item>PUBLIC</item>
+      <item>REUSE_FROM</item>
+    </list>
     <list name="target_sources_nargs">
       <item>INTERFACE</item>
       <item>PRIVATE</item>
@@ -1235,6 +1244,7 @@
       <item>CMAKE_AUTOMOC</item>
       <item>CMAKE_AUTOMOC_DEPEND_FILTERS</item>
       <item>CMAKE_AUTOMOC_MOC_OPTIONS</item>
+      <item>CMAKE_AUTOMOC_PATH_PREFIX</item>
       <item>CMAKE_AUTOMOC_RELAXED_MODE</item>
       <item>CMAKE_AUTORCC</item>
       <item>CMAKE_AUTORCC_OPTIONS</item>
@@ -1270,6 +1280,7 @@
       <item>CMAKE_CROSSCOMPILING_EMULATOR</item>
       <item>CMAKE_CTEST_COMMAND</item>
       <item>CMAKE_CUDA_EXTENSIONS</item>
+      <item>CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS</item>
       <item>CMAKE_CUDA_SEPARABLE_COMPILATION</item>
       <item>CMAKE_CUDA_STANDARD</item>
       <item>CMAKE_CUDA_STANDARD_REQUIRED</item>
@@ -1296,6 +1307,7 @@
       <item>CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES</item>
       <item>CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT</item>
       <item>CMAKE_ECLIPSE_MAKE_ARGUMENTS</item>
+      <item>CMAKE_ECLIPSE_RESOURCE_ENCODING</item>
       <item>CMAKE_ECLIPSE_VERSION</item>
       <item>CMAKE_EDIT_COMMAND</item>
       <item>CMAKE_ENABLE_EXPORTS</item>
@@ -1331,6 +1343,12 @@
       <item>CMAKE_FIND_ROOT_PATH_MODE_LIBRARY</item>
       <item>CMAKE_FIND_ROOT_PATH_MODE_PACKAGE</item>
       <item>CMAKE_FIND_ROOT_PATH_MODE_PROGRAM</item>
+      <item>CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH</item>
+      <item>CMAKE_FIND_USE_CMAKE_PATH</item>
+      <item>CMAKE_FIND_USE_CMAKE_SYSTEM_PATH</item>
+      <item>CMAKE_FIND_USE_PACKAGE_REGISTRY</item>
+      <item>CMAKE_FIND_USE_PACKAGE_ROOT_PATH</item>
+      <item>CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH</item>
       <item>CMAKE_FOLDER</item>
       <item>CMAKE_FRAMEWORK</item>
       <item>CMAKE_FRAMEWORK_PATH</item>
@@ -1405,6 +1423,7 @@
       <item>CMAKE_INSTALL_OPENMP_LIBRARIES</item>
       <item>CMAKE_INSTALL_PREFIX</item>
       <item>CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT</item>
+      <item>CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH</item>
       <item>CMAKE_INSTALL_RPATH</item>
       <item>CMAKE_INSTALL_RPATH_USE_LINK_PATH</item>
       <item>CMAKE_INSTALL_RUNSTATEDIR</item>
@@ -1444,6 +1463,7 @@
       <item>CMAKE_MAKE_PROGRAM</item>
       <item>CMAKE_MATCH_COUNT</item>
       <item>CMAKE_MAXIMUM_RECURSION_DEPTH</item>
+      <item>CMAKE_MESSAGE_INDENT</item>
       <item>CMAKE_MFC_FLAG</item>
       <item>CMAKE_MINIMUM_REQUIRED_VERSION</item>
       <item>CMAKE_MINOR_VERSION</item>
@@ -1540,6 +1560,8 @@
       <item>CMAKE_TRY_COMPILE_PLATFORM_VARIABLES</item>
       <item>CMAKE_TRY_COMPILE_TARGET_TYPE</item>
       <item>CMAKE_TWEAK_VERSION</item>
+      <item>CMAKE_UNITY_BUILD</item>
+      <item>CMAKE_UNITY_BUILD_BATCH_SIZE</item>
       <item>CMAKE_USER_MAKE_RULES_OVERRIDE</item>
       <item>CMAKE_USE_PTHREADS_INIT</item>
       <item>CMAKE_USE_RELATIVE_PATHS</item>
@@ -1577,6 +1599,7 @@
       <item>CMAKE_XCODE_PLATFORM_TOOLSET</item>
       <item>CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER</item>
       <item>CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN</item>
+      <item>CMAKE_XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING</item>
       <item>CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER</item>
       <item>CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS</item>
       <item>CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE</item>
@@ -1700,10 +1723,12 @@
       <item>CPACK_IFW_VERBOSE</item>
       <item>CPACK_INCLUDE_TOPLEVEL_DIRECTORY</item>
       <item>CPACK_INSTALLED_DIRECTORIES</item>
+      <item>CPACK_INSTALL_CMAKE_CONFIGURATIONS</item>
       <item>CPACK_INSTALL_CMAKE_PROJECTS</item>
       <item>CPACK_INSTALL_COMMANDS</item>
       <item>CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS</item>
       <item>CPACK_INSTALL_SCRIPT</item>
+      <item>CPACK_INSTALL_SCRIPTS</item>
       <item>CPACK_MONOLITHIC_INSTALL</item>
       <item>CPACK_NSIS_COMPRESSOR</item>
       <item>CPACK_NSIS_CONTACT</item>
@@ -1759,6 +1784,7 @@
       <item>CPACK_PACKAGE_INSTALL_DIRECTORY</item>
       <item>CPACK_PACKAGE_INSTALL_REGISTRY_KEY</item>
       <item>CPACK_PACKAGE_NAME</item>
+      <item>CPACK_PACKAGE_RELOCATABLE</item>
       <item>CPACK_PACKAGE_VENDOR</item>
       <item>CPACK_PACKAGE_VERSION</item>
       <item>CPACK_PACKAGE_VERSION_MAJOR</item>
@@ -2161,6 +2187,7 @@
       <item>AUTOMOC_EXECUTABLE</item>
       <item>AUTOMOC_MACRO_NAMES</item>
       <item>AUTOMOC_MOC_OPTIONS</item>
+      <item>AUTOMOC_PATH_PREFIX</item>
       <item>AUTORCC</item>
       <item>AUTORCC_EXECUTABLE</item>
       <item>AUTORCC_OPTIONS</item>
@@ -2202,6 +2229,7 @@
       <item>DEFINE_SYMBOL</item>
       <item>DEPLOYMENT_ADDITIONAL_FILES</item>
       <item>DEPLOYMENT_REMOTE_DIRECTORY</item>
+      <item>DISABLE_PRECOMPILE_HEADERS</item>
       <item>DOTNET_TARGET_FRAMEWORK_VERSION</item>
       <item>ENABLE_EXPORTS</item>
       <item>EXCLUDE_FROM_ALL</item>
@@ -2236,6 +2264,7 @@
       <item>IMPORT_SUFFIX</item>
       <item>INCLUDE_DIRECTORIES</item>
       <item>INSTALL_NAME_DIR</item>
+      <item>INSTALL_REMOVE_ENVIRONMENT_RPATH</item>
       <item>INSTALL_RPATH</item>
       <item>INSTALL_RPATH_USE_LINK_PATH</item>
       <item>INTERFACE_AUTOUIC_OPTIONS</item>
@@ -2248,6 +2277,7 @@
       <item>INTERFACE_LINK_LIBRARIES</item>
       <item>INTERFACE_LINK_OPTIONS</item>
       <item>INTERFACE_POSITION_INDEPENDENT_CODE</item>
+      <item>INTERFACE_PRECOMPILE_HEADERS</item>
       <item>INTERFACE_SOURCES</item>
       <item>INTERFACE_SYSTEM_INCLUDE_DIRECTORIES</item>
       <item>INTERPROCEDURAL_OPTIMIZATION</item>
@@ -2284,6 +2314,8 @@
       <item>PDB_NAME</item>
       <item>PDB_OUTPUT_DIRECTORY</item>
       <item>POSITION_INDEPENDENT_CODE</item>
+      <item>PRECOMPILE_HEADERS</item>
+      <item>PRECOMPILE_HEADERS_REUSE_FROM</item>
       <item>PREFIX</item>
       <item>PRIVATE_HEADER</item>
       <item>PROJECT_LABEL</item>
@@ -2305,6 +2337,10 @@
       <item>Swift_MODULE_DIRECTORY</item>
       <item>Swift_MODULE_NAME</item>
       <item>TYPE</item>
+      <item>UNITY_BUILD</item>
+      <item>UNITY_BUILD_BATCH_SIZE</item>
+      <item>UNITY_BUILD_CODE_AFTER_INCLUDE</item>
+      <item>UNITY_BUILD_CODE_BEFORE_INCLUDE</item>
       <item>VERSION</item>
       <item>VISIBILITY_INLINES_HIDDEN</item>
       <item>VS_CONFIGURATION_TYPE</item>
@@ -2316,6 +2352,7 @@
       <item>VS_DOTNET_REFERENCES</item>
       <item>VS_DOTNET_REFERENCES_COPY_LOCAL</item>
       <item>VS_DOTNET_TARGET_FRAMEWORK_VERSION</item>
+      <item>VS_DPI_AWARE</item>
       <item>VS_GLOBAL_KEYWORD</item>
       <item>VS_GLOBAL_PROJECT_TYPES</item>
       <item>VS_GLOBAL_ROOTNAMESPACE</item>
@@ -2346,6 +2383,7 @@
       <item>XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN</item>
       <item>XCODE_SCHEME_ARGUMENTS</item>
       <item>XCODE_SCHEME_DEBUG_AS_ROOT</item>
+      <item>XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING</item>
       <item>XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER</item>
       <item>XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS</item>
       <item>XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE</item>
@@ -2386,6 +2424,8 @@
       <item>SKIP_AUTOMOC</item>
       <item>SKIP_AUTORCC</item>
       <item>SKIP_AUTOUIC</item>
+      <item>SKIP_PRECOMPILE_HEADERS</item>
+      <item>SKIP_UNITY_BUILD_INCLUSION</item>
       <item>SYMBOLIC</item>
       <item>Swift_DEPENDENCIES_FILE</item>
       <item>Swift_DIAGNOSTICS_FILE</item>
@@ -2429,6 +2469,7 @@
       <item>REQUIRED_FILES</item>
       <item>RESOURCE_LOCK</item>
       <item>RUN_SERIAL</item>
+      <item>SKIP_REGULAR_EXPRESSION</item>
       <item>SKIP_RETURN_CODE</item>
       <item>TIMEOUT</item>
       <item>TIMEOUT_AFTER_MATCH</item>
@@ -2621,6 +2662,7 @@
         <WordDetect String="target_link_directories" insensitive="true" attribute="Command" context="target_link_directories_ctx" />
         <WordDetect String="target_link_libraries" insensitive="true" attribute="Command" context="target_link_libraries_ctx" />
         <WordDetect String="target_link_options" insensitive="true" attribute="Command" context="target_link_options_ctx" />
+        <WordDetect String="target_precompile_headers" insensitive="true" attribute="Command" context="target_precompile_headers_ctx" />
         <WordDetect String="target_sources" insensitive="true" attribute="Command" context="target_sources_ctx" />
         <WordDetect String="try_compile" insensitive="true" attribute="Command" context="try_compile_ctx" />
         <WordDetect String="try_run" insensitive="true" attribute="Command" context="try_run_ctx" />
@@ -3442,6 +3484,14 @@
         <keyword attribute="Named Args" context="#stay" String="target_link_options_nargs" />
         <IncludeRules context="User Function Args" />
       </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="target_precompile_headers_ctx">
+        <DetectChar attribute="Normal Text" context="target_precompile_headers_ctx_op" char="(" />
+      </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="target_precompile_headers_ctx_op">
+        <IncludeRules context="EndCmdPop2" />
+        <keyword attribute="Named Args" context="#stay" String="target_precompile_headers_nargs" />
+        <IncludeRules context="User Function Args" />
+      </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="target_sources_ctx">
         <DetectChar attribute="Normal Text" context="target_sources_ctx_op" char="(" />
       </context>
@@ -3679,6 +3729,7 @@
         <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_LIBRARY_DIRS\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION_COUNT\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION_STRING\b" />
+        <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_MODULE_NAME\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_POSTFIX\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_ANDROID_TOOLCHAIN_MACHINE\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_ANDROID_TOOLCHAIN_PREFIX\b" />
@@ -3771,7 +3822,7 @@
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_GROUP\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_HIDDEN\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_REQUIRED\b" />
-        <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_DESCRIPTION\b" />
+        <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_DESCRIPTION\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_FILE_NAME\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_ARCHITECTURE\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_BREAKS\b" />