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="17"
+    version="18"
     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
@@ -149,7 +149,6 @@
     - CUDA_PTX_COMPILATION
     - CUDA_SEPARABLE_COMPILATION
     - CUDA_RESOLVE_DEVICE_SYMBOLS
-    - CUDA_RESOLVE_DEVICE_SYMBOLS                           # Since 3.16
     - CUDA_EXTENSIONS
     - CUDA_STANDARD
     - CUDA_STANDARD_REQUIRED
@@ -705,6 +704,7 @@
     - 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_FIND_USE_SYSTEM_PACKAGE_REGISTRY                # Since 3.16
     - CMAKE_FRAMEWORK_PATH
     - CMAKE_IGNORE_PATH
     - CMAKE_INCLUDE_DIRECTORIES_BEFORE
@@ -1517,7 +1517,6 @@
     - 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
@@ -2326,7 +2325,22 @@
     -
         name: enable_language
         named-args: [OPTIONAL]
-        special-args: [C, CXX, RC, Fortran]
+        special-args: [
+            ASM
+          , ASM-ATT
+          , ASM_NASM
+          , ASM_MASM
+          , C
+          , CSharp
+          , CXX
+          , CUDA
+          , Java
+          , OBJC                                            # Since 3.16
+          , OBJCXX                                          # Since 3.16
+          , RC
+          , Fortran
+          , Swift
+          ]
     -
         name: enable_testing
     -
@@ -2430,7 +2444,23 @@
           , HOMEPAGE_URL                                    # Since 3.12
           , LANGUAGES
           ]
-        special-args: [NONE, C, CXX, RC, CUDA, Fortran, ASM]
+        special-args: [
+            ASM
+          , ASM-ATT
+          , ASM_NASM
+          , ASM_MASM
+          , C
+          , CSharp
+          , CXX
+          , CUDA
+          , Java
+          , OBJC                                            # Since 3.16
+          , OBJCXX                                          # Since 3.16
+          , RC
+          , Fortran
+          , Swift
+          , NONE                                            # This one is different from `enable_language`
+          ]
     -
         name: qt_wrap_cpp
     -
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="17"
+    version="18"
     kateversion="2.4"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"
@@ -831,10 +831,20 @@
       <item>OPTIONAL</item>
     </list>
     <list name="enable_language_sargs">
+      <item>ASM</item>
+      <item>ASM-ATT</item>
+      <item>ASM_MASM</item>
+      <item>ASM_NASM</item>
       <item>C</item>
+      <item>CSharp</item>
+      <item>CUDA</item>
       <item>CXX</item>
       <item>Fortran</item>
+      <item>Java</item>
+      <item>OBJC</item>
+      <item>OBJCXX</item>
       <item>RC</item>
+      <item>Swift</item>
     </list>
     <list name="export_nargs">
       <item>ANDROID_MK</item>
@@ -931,12 +941,20 @@
     </list>
     <list name="project_sargs">
       <item>ASM</item>
+      <item>ASM-ATT</item>
+      <item>ASM_MASM</item>
+      <item>ASM_NASM</item>
       <item>C</item>
+      <item>CSharp</item>
       <item>CUDA</item>
       <item>CXX</item>
       <item>Fortran</item>
+      <item>Java</item>
       <item>NONE</item>
+      <item>OBJC</item>
+      <item>OBJCXX</item>
       <item>RC</item>
+      <item>Swift</item>
     </list>
     <list name="set_source_files_properties_nargs">
       <item>PROPERTIES</item>
@@ -1349,6 +1367,7 @@
       <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_FIND_USE_SYSTEM_PACKAGE_REGISTRY</item>
       <item>CMAKE_FOLDER</item>
       <item>CMAKE_FRAMEWORK</item>
       <item>CMAKE_FRAMEWORK_PATH</item>
@@ -1723,7 +1742,6 @@
       <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>