devel/cmake: Update to 3.20.1

This new version of CMake is much more picky with the language
than previous versions, so there was a fair bit of fallout --
patched before this push with plenty of "fix in advance of CMake
3.20" commits.

Release notes are at
	https://cmake.org/cmake/help/v3.20/release/3.20.html

Thanks to antoine@ for multiple exp-runs.

11 files changed, 88 insertions, 100 deletions

diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile
index c7f2a7b86e0d..f8100f67b3c2 100644
--- a/devel/cmake-doc/Makefile
+++ b/devel/cmake-doc/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	cmake
-DISTVERSION=	3.19.6
-PORTREVISION=	1
+DISTVERSION=	3.20.1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-doc
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index 47606c1457f2..7095f9a8125c 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cmake
-DISTVERSION=	3.19.6
+DISTVERSION=	3.20.1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-gui
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index acdcf2dd45f2..774cc4775b8f 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cmake
 # Remember to update devel/cmake-doc and devel/cmake-gui as well.
-DISTVERSION=	3.19.6
+DISTVERSION=	3.20.1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
 		https://www.cmake.org/files/v${PORTVERSION}/
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 4448fa359c67..8380e01361ad 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614237387
-SHA256 (cmake-3.19.6.tar.gz) = ec87ab67c45f47c4285f204280c5cde48e1c920cfcfed1555b27fb3b1a1d20ba
-SIZE (cmake-3.19.6.tar.gz) = 9270931
+TIMESTAMP = 1618746679
+SHA256 (cmake-3.20.1.tar.gz) = 3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0
+SIZE (cmake-3.20.1.tar.gz) = 9438789
diff --git a/devel/cmake/files/patch-Modules_FindBoost.cmake b/devel/cmake/files/patch-Modules_FindBoost.cmake
index 0070968820da..add21b84c0f7 100644
--- a/devel/cmake/files/patch-Modules_FindBoost.cmake
+++ b/devel/cmake/files/patch-Modules_FindBoost.cmake
@@ -1,25 +1,26 @@
---- Modules/FindBoost.cmake.orig	2019-02-07 20:55:01 UTC
+--- Modules/FindBoost.cmake.orig	2021-03-23 15:43:17 UTC
 +++ Modules/FindBoost.cmake
-@@ -56,6 +56,8 @@ This module reads hints about search locations from va
-    (or BOOSTROOT)
-   BOOST_INCLUDEDIR       - Preferred include directory e.g. <prefix>/include
-   BOOST_LIBRARYDIR       - Preferred library directory e.g. <prefix>/lib
-+  BOOST_PYTHON_SUFFIX    - Preferred Python version
+@@ -135,6 +135,9 @@ This module reads hints about search locations from va
+ ``BOOST_LIBRARYDIR``
+   Preferred library directory e.g. ``<prefix>/lib``.
+ 
++``BOOST_PYTHON_SUFFIX``
++  Preferred Python version.
 +
-   Boost_NO_SYSTEM_PATHS  - Set to ON to disable searching in locations not
-                            specified by these hint variables. Default is OFF.
-   Boost_ADDITIONAL_VERSIONS
-@@ -242,6 +244,9 @@ Set Boost_NO_BOOST_CMAKE to ON to disable the search f
- cmake_policy(PUSH)
- cmake_policy(SET CMP0057 NEW) # if IN_LIST
+ ``Boost_NO_SYSTEM_PATHS``
+   Set to ``ON`` to disable searching in locations not
+   specified by these hint variables. Default is ``OFF``.
+@@ -558,6 +561,9 @@ function(_boost_set_legacy_variables_from_config)
+   endif()
+ endfunction()
  
 +# https://gitlab.kitware.com/cmake/cmake/issues/18865
 +set(Boost_NO_BOOST_CMAKE ON CACHE BOOL "Disable the search for boost-cmake")
 +
  #-------------------------------------------------------------------------------
- # Before we go searching, check whether boost-cmake is available, unless the
- # user specifically asked NOT to search for boost-cmake.
-@@ -1739,10 +1744,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ # Before we go searching, check whether a boost cmake package is available, unless
+ # the user specifically asked NOT to search for one.
+@@ -2131,10 +2137,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
    # Handle Python version suffixes
    unset(COMPONENT_PYTHON_VERSION_MAJOR)
    unset(COMPONENT_PYTHON_VERSION_MINOR)
diff --git a/devel/cmake/files/patch-Modules_FindFLEX.cmake b/devel/cmake/files/patch-Modules_FindFLEX.cmake
index 0d448b432d68..35c316b28952 100644
--- a/devel/cmake/files/patch-Modules_FindFLEX.cmake
+++ b/devel/cmake/files/patch-Modules_FindFLEX.cmake
@@ -1,6 +1,6 @@
---- Modules/FindFLEX.cmake.orig	2020-01-19 09:02:30 UTC
+--- Modules/FindFLEX.cmake.orig	2021-03-23 15:43:17 UTC
 +++ Modules/FindFLEX.cmake
-@@ -103,10 +103,15 @@ find_program(FLEX_EXECUTABLE NAMES flex win_flex DOC "
+@@ -112,10 +112,15 @@ find_program(FLEX_EXECUTABLE NAMES flex win-flex win_f
  mark_as_advanced(FLEX_EXECUTABLE)
  
  find_library(FL_LIBRARY NAMES fl
diff --git a/devel/cmake/files/patch-Modules_FindOpenMP.cmake b/devel/cmake/files/patch-Modules_FindOpenMP.cmake
index bed38ca7823f..b5b5e7edf265 100644
--- a/devel/cmake/files/patch-Modules_FindOpenMP.cmake
+++ b/devel/cmake/files/patch-Modules_FindOpenMP.cmake
@@ -7,9 +7,9 @@ Look for omp.h in LOCALBASE and pass suitable -I and -L flags
 if those are necessary. Also use OpenMP flags when linking.
 PR 223678 and PR 234050.
 
---- Modules/FindOpenMP.cmake.orig	2019-04-03 08:45:25 UTC
+--- Modules/FindOpenMP.cmake.orig	2021-03-23 15:43:17 UTC
 +++ Modules/FindOpenMP.cmake
-@@ -80,6 +80,33 @@ cmake_policy(SET CMP0012 NEW) # if() recognizes number
+@@ -97,6 +97,33 @@ cmake_policy(SET CMP0012 NEW) # if() recognizes number
  cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
  cmake_policy(SET CMP0057 NEW) # if IN_LIST
  
@@ -43,7 +43,7 @@ PR 223678 and PR 234050.
  function(_OPENMP_FLAG_CANDIDATES LANG)
    if(NOT OpenMP_${LANG}_FLAG)
      unset(OpenMP_FLAG_CANDIDATES)
-@@ -185,6 +212,15 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_
+@@ -210,6 +237,15 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_
      if(OpenMP_VERBOSE_COMPILE_OPTIONS)
        string(APPEND OPENMP_FLAGS_TEST " ${OpenMP_VERBOSE_COMPILE_OPTIONS}")
      endif()
@@ -59,7 +59,7 @@ PR 223678 and PR 234050.
      string(REGEX REPLACE "[-/=+]" "" OPENMP_PLAIN_FLAG "${OPENMP_FLAG}")
      try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} ${CMAKE_BINARY_DIR} ${_OPENMP_TEST_SRC}
        CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}"
-@@ -192,8 +228,23 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_
+@@ -217,8 +253,23 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_
        OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT
      )
  
@@ -84,7 +84,7 @@ PR 223678 and PR 234050.
  
        if(CMAKE_${LANG}_VERBOSE_FLAG)
          unset(OpenMP_${LANG}_IMPLICIT_LIBRARIES)
-@@ -491,9 +542,16 @@ foreach(LANG IN LISTS OpenMP_FINDLIST)
+@@ -565,9 +616,16 @@ foreach(LANG IN LISTS OpenMP_FINDLIST)
          add_library(OpenMP::OpenMP_${LANG} INTERFACE IMPORTED)
        endif()
        if(OpenMP_${LANG}_FLAGS)
@@ -102,4 +102,4 @@ PR 223678 and PR 234050.
 +          INTERFACE_LINK_OPTIONS "$<$<COMPILE_LANGUAGE:${LANG}>:${_OpenMP_${LANG}_LINK_OPTIONS}>")
          unset(_OpenMP_${LANG}_OPTIONS)
        endif()
-       if(OpenMP_${LANG}_LIBRARIES)
+       if(OpenMP_${LANG}_INCLUDE_DIRS)
diff --git a/devel/cmake/files/patch-Modules_FindSDL.cmake b/devel/cmake/files/patch-Modules_FindSDL.cmake
index 4c296bf05932..af947dd74381 100644
--- a/devel/cmake/files/patch-Modules_FindSDL.cmake
+++ b/devel/cmake/files/patch-Modules_FindSDL.cmake
@@ -1,6 +1,6 @@
---- Modules/FindSDL.cmake.orig	2017-05-31 14:00:09 UTC
+--- Modules/FindSDL.cmake.orig	2021-03-23 15:43:17 UTC
 +++ Modules/FindSDL.cmake
-@@ -85,6 +85,11 @@ else()
+@@ -124,6 +124,11 @@ else()
    set(VC_LIB_PATH_SUFFIX lib/x86)
  endif()
  
diff --git a/devel/cmake/files/patch-cmake-issue-18031 b/devel/cmake/files/patch-cmake-issue-18031
index 601a43b73cb1..89681cf0b022 100644
--- a/devel/cmake/files/patch-cmake-issue-18031
+++ b/devel/cmake/files/patch-cmake-issue-18031
@@ -1,6 +1,4 @@
-diff --git Modules/Internal/CPack/CPackFreeBSD.cmake Modules/Internal/CPack/CPackFreeBSD.cmake
-index ae40532017..c35089cbcf 100644
---- Modules/Internal/CPack/CPackFreeBSD.cmake
+--- Modules/Internal/CPack/CPackFreeBSD.cmake.orig	2021-03-23 15:43:17 UTC
 +++ Modules/Internal/CPack/CPackFreeBSD.cmake
 @@ -34,7 +34,7 @@ function(_cpack_freebsd_fallback_var OUTPUT_VAR_NAME)
      endif()
@@ -11,9 +9,7 @@ index ae40532017..c35089cbcf 100644
    endif()
  endfunction()
  
-diff --git Source/CPack/cmCPackFreeBSDGenerator.cxx Source/CPack/cmCPackFreeBSDGenerator.cxx
-index b673006f25..9bafc792db 100644
---- Source/CPack/cmCPackFreeBSDGenerator.cxx
+--- Source/CPack/cmCPackFreeBSDGenerator.cxx.orig	2021-03-23 15:43:17 UTC
 +++ Source/CPack/cmCPackFreeBSDGenerator.cxx
 @@ -21,8 +21,12 @@
  
diff --git a/devel/cmake/files/patch-cmake-issue-21408 b/devel/cmake/files/patch-cmake-issue-21408
deleted file mode 100644
index 3968ff8e8a08..000000000000
--- a/devel/cmake/files/patch-cmake-issue-21408
+++ /dev/null
@@ -1,59 +0,0 @@
-- Backport https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5483/diffs?commit_id=15e77fbd40e324fd0be394a73ed94800bb47ad2e that is schedueled for 3.20
-
-diff --git Modules/FortranCInterface.cmake Modules/FortranCInterface.cmake
-index 547346ba90782d765cac860f755641cfb55b6dcf..733c7232c737e1c9a721124fc8a5465eaf872d91 100644
---- Modules/FortranCInterface.cmake
-+++ Modules/FortranCInterface.cmake
-@@ -343,6 +343,13 @@ function(FortranCInterface_VERIFY)
-     set(_desc "Verifying Fortran/${lang} Compiler Compatibility")
-     message(CHECK_START "${_desc}")
- 
-+    cmake_policy(GET CMP0056 _FortranCInterface_CMP0056)
-+    if(_FortranCInterface_CMP0056 STREQUAL "NEW")
-+      set(_FortranCInterface_EXE_LINKER_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}")
-+    else()
-+      set(_FortranCInterface_EXE_LINKER_FLAGS "")
-+    endif()
-+
-     # Build a sample project which reports symbols.
-     set(CMAKE_TRY_COMPILE_CONFIGURATION Release)
-     try_compile(FortranCInterface_VERIFY_${lang}_COMPILED
-@@ -358,6 +365,7 @@ function(FortranCInterface_VERIFY)
-                  "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}"
-                  "-DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}"
-                  "-DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}"
-+                 ${_FortranCInterface_EXE_LINKER_FLAGS}
-       OUTPUT_VARIABLE _output)
-     file(WRITE "${FortranCInterface_BINARY_DIR}/Verify${lang}/output.txt" "${_output}")
- 
-diff --git Modules/FortranCInterface/Detect.cmake Modules/FortranCInterface/Detect.cmake
-index c75067b32e4b7eeba1edf7d6bc6acc3798032dd7..998faf1eccf92f654f78ea66f2a34a8b05b5f991 100644
---- Modules/FortranCInterface/Detect.cmake
-+++ Modules/FortranCInterface/Detect.cmake
-@@ -26,6 +26,14 @@ unset(FortranCInterface_VERIFIED_CXX CACHE)
- 
- set(_result)
- 
-+cmake_policy(GET CMP0056 _FortranCInterface_CMP0056)
-+if(_FortranCInterface_CMP0056 STREQUAL "NEW")
-+  set(_FortranCInterface_EXE_LINKER_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}")
-+else()
-+  set(_FortranCInterface_EXE_LINKER_FLAGS "")
-+endif()
-+unset(_FortranCInterface_CMP0056)
-+
- # Build a sample project which reports symbols.
- set(CMAKE_TRY_COMPILE_CONFIGURATION Release)
- try_compile(FortranCInterface_COMPILED
-@@ -38,9 +46,11 @@ try_compile(FortranCInterface_COMPILED
-     "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}"
-     "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}"
-     "-DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}"
-+    ${_FortranCInterface_EXE_LINKER_FLAGS}
-   OUTPUT_VARIABLE FortranCInterface_OUTPUT)
- set(FortranCInterface_COMPILED ${FortranCInterface_COMPILED})
- unset(FortranCInterface_COMPILED CACHE)
-+unset(_FortranCInterface_EXE_LINKER_FLAGS)
- 
- # Locate the sample project executable.
- set(FortranCInterface_EXE)
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index 5e9d679a8971..17a9b8d7c1ac 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -29,6 +29,7 @@ share/aclocal/cmake.m4
 share/bash-completion/completions/cmake
 share/bash-completion/completions/cpack
 share/bash-completion/completions/ctest
+
 %%DATADIR%%/Help/command/DEVICE_LINK_OPTIONS.txt
 %%DATADIR%%/Help/command/FIND_XXX.txt
 %%DATADIR%%/Help/command/FIND_XXX_ORDER.txt
@@ -54,6 +55,7 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/command/cmake_language.rst
 %%DATADIR%%/Help/command/cmake_minimum_required.rst
 %%DATADIR%%/Help/command/cmake_parse_arguments.rst
+%%DATADIR%%/Help/command/cmake_path.rst
 %%DATADIR%%/Help/command/cmake_policy.rst
 %%DATADIR%%/Help/command/configure_file.rst
 %%DATADIR%%/Help/command/continue.rst
@@ -197,6 +199,7 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/envvar/CTEST_PARALLEL_LEVEL.rst
 %%DATADIR%%/Help/envvar/CTEST_PROGRESS_OUTPUT.rst
 %%DATADIR%%/Help/envvar/CTEST_USE_LAUNCHERS_DEFAULT.rst
+%%DATADIR%%/Help/envvar/CUDAARCHS.rst
 %%DATADIR%%/Help/envvar/CUDACXX.rst
 %%DATADIR%%/Help/envvar/CUDAFLAGS.rst
 %%DATADIR%%/Help/envvar/CUDAHOSTCXX.rst
@@ -661,6 +664,12 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/policy/CMP0112.rst
 %%DATADIR%%/Help/policy/CMP0113.rst
 %%DATADIR%%/Help/policy/CMP0114.rst
+%%DATADIR%%/Help/policy/CMP0115.rst
+%%DATADIR%%/Help/policy/CMP0116.rst
+%%DATADIR%%/Help/policy/CMP0117.rst
+%%DATADIR%%/Help/policy/CMP0118.rst
+%%DATADIR%%/Help/policy/CMP0119.rst
+%%DATADIR%%/Help/policy/CMP0120.rst
 %%DATADIR%%/Help/policy/DEPRECATED.txt
 %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
 %%DATADIR%%/Help/prop_cache/ADVANCED.rst
@@ -920,6 +929,7 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_ALL.rst
 %%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.rst
 %%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD_CONFIG.rst
+%%DATADIR%%/Help/prop_tgt/EXPORT_COMPILE_COMMANDS.rst
 %%DATADIR%%/Help/prop_tgt/EXPORT_NAME.rst
 %%DATADIR%%/Help/prop_tgt/EXPORT_PROPERTIES.rst
 %%DATADIR%%/Help/prop_tgt/EchoString.rst
@@ -1085,6 +1095,7 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/prop_tgt/UNITY_BUILD_CODE_AFTER_INCLUDE.rst
 %%DATADIR%%/Help/prop_tgt/UNITY_BUILD_CODE_BEFORE_INCLUDE.rst
 %%DATADIR%%/Help/prop_tgt/UNITY_BUILD_MODE.rst
+%%DATADIR%%/Help/prop_tgt/UNITY_BUILD_UNIQUE_ID.rst
 %%DATADIR%%/Help/prop_tgt/VERSION.rst
 %%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
 %%DATADIR%%/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
@@ -1128,6 +1139,10 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/prop_tgt/WIN32_EXECUTABLE.rst
 %%DATADIR%%/Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst
 %%DATADIR%%/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
+%%DATADIR%%/Help/prop_tgt/XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY.rst
+%%DATADIR%%/Help/prop_tgt/XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY.rst
+%%DATADIR%%/Help/prop_tgt/XCODE_EMBED_type.rst
+%%DATADIR%%/Help/prop_tgt/XCODE_EMBED_type_PATH.rst
 %%DATADIR%%/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst
 %%DATADIR%%/Help/prop_tgt/XCODE_GENERATE_SCHEME.rst
 %%DATADIR%%/Help/prop_tgt/XCODE_LINK_BUILD_PHASE_MODE.rst
@@ -1169,6 +1184,7 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/release/3.18.rst
 %%DATADIR%%/Help/release/3.19.rst
 %%DATADIR%%/Help/release/3.2.rst
+%%DATADIR%%/Help/release/3.20.rst
 %%DATADIR%%/Help/release/3.3.rst
 %%DATADIR%%/Help/release/3.4.rst
 %%DATADIR%%/Help/release/3.5.rst
@@ -1193,6 +1209,7 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_ARM_MODE.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_ARM_NEON.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_ASSETS_DIRECTORIES.rst
+%%DATADIR%%/Help/variable/CMAKE_ANDROID_EXCEPTIONS.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_GUI.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_JAR_DEPENDENCIES.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_JAR_DIRECTORIES.rst
@@ -1203,9 +1220,11 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst
+%%DATADIR%%/Help/variable/CMAKE_ANDROID_NDK_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_PROGUARD.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_PROGUARD_CONFIG_PATH.rst
+%%DATADIR%%/Help/variable/CMAKE_ANDROID_RTTI.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_SECURE_PROPS_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_SKIP_ANT_STEP.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_STANDALONE_TOOLCHAIN.rst
@@ -1298,6 +1317,7 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/variable/CMAKE_DEFAULT_BUILD_TYPE.rst
 %%DATADIR%%/Help/variable/CMAKE_DEFAULT_CONFIGS.rst
 %%DATADIR%%/Help/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.rst
+%%DATADIR%%/Help/variable/CMAKE_DEPENDS_USE_COMPILER.rst
 %%DATADIR%%/Help/variable/CMAKE_DIRECTORY_LABELS.rst
 %%DATADIR%%/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
 %%DATADIR%%/Help/variable/CMAKE_DISABLE_PRECOMPILE_HEADERS.rst
@@ -1415,6 +1435,7 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_CREATE.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_FINISH.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_BYTE_ORDER.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_CLANG_TIDY.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ABI.rst
@@ -1605,6 +1626,7 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Help/variable/CMAKE_TWEAK_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_UNITY_BUILD.rst
 %%DATADIR%%/Help/variable/CMAKE_UNITY_BUILD_BATCH_SIZE.rst
+%%DATADIR%%/Help/variable/CMAKE_UNITY_BUILD_UNIQUE_ID.rst
 %%DATADIR%%/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE.rst
 %%DATADIR%%/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG.rst
 %%DATADIR%%/Help/variable/CMAKE_USE_RELATIVE_PATHS.rst
@@ -1906,6 +1928,7 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Modules/CMakeParseArguments.cmake
 %%DATADIR%%/Modules/CMakeParseImplicitIncludeInfo.cmake
 %%DATADIR%%/Modules/CMakeParseImplicitLinkInfo.cmake
+%%DATADIR%%/Modules/CMakeParseLibraryArchitecture.cmake
 %%DATADIR%%/Modules/CMakePlatformId.h.in
 %%DATADIR%%/Modules/CMakePrintHelpers.cmake
 %%DATADIR%%/Modules/CMakePrintSystemInformation.cmake
@@ -2095,6 +2118,12 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Modules/Compiler/Intel-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/Intel-ISPC.cmake
 %%DATADIR%%/Modules/Compiler/Intel.cmake
+%%DATADIR%%/Modules/Compiler/IntelLLVM-ASM.cmake
+%%DATADIR%%/Modules/Compiler/IntelLLVM-C.cmake
+%%DATADIR%%/Modules/Compiler/IntelLLVM-CXX.cmake
+%%DATADIR%%/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/IntelLLVM-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/IntelLLVM.cmake
 %%DATADIR%%/Modules/Compiler/MSVC-ASM.cmake
 %%DATADIR%%/Modules/Compiler/MSVC-C-FeatureTests.cmake
 %%DATADIR%%/Modules/Compiler/MSVC-C.cmake
@@ -2102,6 +2131,11 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake
 %%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/NAG-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/NVHPC-C.cmake
+%%DATADIR%%/Modules/Compiler/NVHPC-CXX.cmake
+%%DATADIR%%/Modules/Compiler/NVHPC-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/NVHPC-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/NVHPC.cmake
 %%DATADIR%%/Modules/Compiler/NVIDIA-CUDA.cmake
 %%DATADIR%%/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/OpenWatcom-C.cmake
@@ -2520,6 +2554,10 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Modules/Platform/Apple-Intel-CXX.cmake
 %%DATADIR%%/Modules/Platform/Apple-Intel-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Apple-Intel.cmake
+%%DATADIR%%/Modules/Platform/Apple-IntelLLVM-C.cmake
+%%DATADIR%%/Modules/Platform/Apple-IntelLLVM-CXX.cmake
+%%DATADIR%%/Modules/Platform/Apple-IntelLLVM-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Apple-IntelLLVM.cmake
 %%DATADIR%%/Modules/Platform/Apple-NAG-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Apple-NVIDIA-CUDA.cmake
 %%DATADIR%%/Modules/Platform/Apple-PGI-C.cmake
@@ -2623,7 +2661,15 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Modules/Platform/Linux-Intel-CXX.cmake
 %%DATADIR%%/Modules/Platform/Linux-Intel-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Linux-Intel.cmake
+%%DATADIR%%/Modules/Platform/Linux-IntelLLVM-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-IntelLLVM-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-IntelLLVM-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-IntelLLVM.cmake
 %%DATADIR%%/Modules/Platform/Linux-NAG-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-NVHPC-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-NVHPC-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-NVHPC-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Linux-NVHPC.cmake
 %%DATADIR%%/Modules/Platform/Linux-OpenWatcom-C.cmake
 %%DATADIR%%/Modules/Platform/Linux-OpenWatcom-CXX.cmake
 %%DATADIR%%/Modules/Platform/Linux-OpenWatcom.cmake
@@ -2703,6 +2749,11 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Modules/Platform/Windows-Intel-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Windows-Intel-ISPC.cmake
 %%DATADIR%%/Modules/Platform/Windows-Intel.cmake
+%%DATADIR%%/Modules/Platform/Windows-IntelLLVM-ASM.cmake
+%%DATADIR%%/Modules/Platform/Windows-IntelLLVM-C.cmake
+%%DATADIR%%/Modules/Platform/Windows-IntelLLVM-CXX.cmake
+%%DATADIR%%/Modules/Platform/Windows-IntelLLVM-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Windows-IntelLLVM.cmake
 %%DATADIR%%/Modules/Platform/Windows-MSVC-C.cmake
 %%DATADIR%%/Modules/Platform/Windows-MSVC-CXX.cmake
 %%DATADIR%%/Modules/Platform/Windows-MSVC.cmake
@@ -2779,9 +2830,10 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Modules/TestForSTDNamespace.cxx
 %%DATADIR%%/Modules/UseEcos.cmake
 %%DATADIR%%/Modules/UseJava.cmake
+%%DATADIR%%/Modules/UseJava/ClassFilelist.cmake
 %%DATADIR%%/Modules/UseJava/ClearClassFiles.cmake
-%%DATADIR%%/Modules/UseJavaClassFilelist.cmake
-%%DATADIR%%/Modules/UseJavaSymlinks.cmake
+%%DATADIR%%/Modules/UseJava/Symlinks.cmake
+%%DATADIR%%/Modules/UseJava/javaTargets.cmake.in
 %%DATADIR%%/Modules/UsePkgConfig.cmake
 %%DATADIR%%/Modules/UseQt4.cmake
 %%DATADIR%%/Modules/UseSWIG.cmake
@@ -2793,7 +2845,6 @@ share/bash-completion/completions/ctest
 %%DATADIR%%/Modules/WriteCompilerDetectionHeader.cmake
 %%DATADIR%%/Modules/ecos_clean.cmake
 %%DATADIR%%/Modules/exportheader.cmake.in
-%%DATADIR%%/Modules/javaTargets.cmake.in
 %%DATADIR%%/Modules/kde3init_dummy.cpp.in
 %%DATADIR%%/Modules/kde3uic.cmake
 %%DATADIR%%/Modules/readme.txt