cmake: updated to 3.21.1

CMake 3.21.1
  AUTOUIC: Fix cyclic dependency between generated UI headers and timestamp
  AUTOUIC: Fix generating of dependency rules for UI header files
  ci: use CMake 3.21.0
  Help/ctest_memcheck: mention `ctest_test` arguments
  TestDriver: suppress deprecated header lints for time.h
  TestDriver: use `CM_NULL` to avoid lints about `nullptr` usage
  Help/ctest_test: add a comment to also update `ctest_memcheck`
  enable_language: Fix test for working compiler with CMP0126 NEW behavior
  VS: Recognize CSharp VS 2019 compiler version v142
  VS: Improve v142 CL flag table LanguageStandard ordering
  VS: Add CSharp VS 2022 compiler version and flag table v143
  VS: Add v143 flag tables for VS 17.0 Preview 2
  VS: Fix `/MANIFESTUAC:` link flag mapping for v143
  VS: Map the link `/debug` flag for v143
  VS: Remove the /MERGE flag from v143 link flag table
  VS: Fix `/analyze:log` flag mapping for v143
  VS: Add `-Zc:inline[-]` flag table entry for v143
  VS: Populate `/Y-` flag table entry for v143
  VS: Populate `-Qspectre-` flag table entry for v143
  VS: Populate `/JMC-` flag table entry for v143
  VS: Remove empty ConformanceMode entry from flag table for v143
  VS: Remove empty LanguageStandard entries from flag table for v143
  VS: Remove empty ExternalWarningLevel entry from flag table for v143
  VS: Remove broken EnableASAN entry from flag table for v143
  VS: Fix `/sourceDependencies` flag table entries for v143
  VS: Update Visual Studio 17 2022 generator for Preview 2
  CMakeDetermineCompilerId: Fix CMAKE_EXECUTABLE_FORMAT in CMP0126 NEW behavior
  try_compile: Propagate CMP0126 to the generated test project
  CMakeDependentOption: Revert "Allow parentheses in the depends string"
  cmMessenger: Revert to non-color messages on Windows
  cmGeneratorExpressionNode: Factor out local variable for global generator
  Swift: Update test case to try CMP0126 NEW behavior
  Ninja Multi-Config: Restore TARGET_OBJECTS support in cross-configs
  VS: Remove cl /FS entry from flag table for v142 and v143
  VS: Remove C++ module CompileAs flag table entries for v142 and v143
  Help: Clarify wording of CMP0124
  Help: Explain policy CMP0125 in more detail
  Help: Make policy CMP0126 wording more accurate
  Help: Fix trivial typo
  Help: Clarify which project() call PROJECT_IS_TOP_LEVEL is for
  Help: Re-order file() sub-commands in Filesystem section
  Help: Expand details for file(COPY_FILE)
  Help: Clarify and correct wording around DEPFILE option
  Help: Improve wording and cross-referencing for ctest JUnit output
  Help: Add cross-references between test output size ctest variables
  IAR: Moved search logic to BinUtils.
  AutoGen: Fix needless compilation of mocs_compilation.cpp
  KWSys 2021-07-26 (d5fd6ca2)
  CMakePresets.json: Fix expansion issue with empty binaryDir
  Tests: Clean up Ninja Multi-Config test from cb777dd
  Compiler/IAR: search for both IAR's binaries * and *.exe
  Compiler/IAR: Avoid clobbering CMAKE_EXECUTABLE_SUFFIX
  Help: Document CMAKE_EXECUTABLE_SUFFIX_<LANG> explicitly
  libuv: Fix building with mingw toolchains for ARM/AArch64
  GNU: Correct C23 flags
  FindXCTest: Fix output directory for test bundle with Xcode 12.5
  Tests/CompileOptions: allow CMAKE_BUILD_TYPE=None
  Add option to explicitly avoid using execinfo for backtraces

CMake 3.21 Release Notes
************************

Changes made since CMake 3.20 include the following.

New Features
============

Presets
-------

* "cmake-presets(7)" gained support for specifying the install prefix
  in a configure preset.

* "cmake-presets(7)" gained support for conditional enabling of
  presets.

* "cmake-presets(7)" gained support for a "${hostSystemName}" macro.

* "cmake-presets(7)" gained support for omitting the "generator" and
  "binaryDir" fields.

Generators
----------

* The Makefile Generators and the "Ninja" generator learned to add
  linker launcher tools along with the linker for "C", "CXX", "OBJC",
  and "OBJCXX" languages. See the "CMAKE_<LANG>_LINKER_LAUNCHER"
  variable and "<LANG>_LINKER_LAUNCHER" target property for details.

* The "Visual Studio 17 2022" generator was added.  This is
  experimental and based on "Visual Studio 2022 Preview 1.1" because
  this version of VS has not been released.

Languages
---------

* CMake learned to support "HIP" as a first-class language that can be
  enabled via the "project()" and "enable_language()" commands.

* "C_STANDARD", "OBJC_STANDARD", and the "Compile Features"
  functionality gained support for C17 and C23.

* Source file extensions ".ixx" and ".cppm" are now treated as C++.

Command-Line
------------

* "cmake(1)" gained the "--install-prefix <dir>" command-line option
  to specify the location of the install prefix.

* "cmake(1)" gained the "--toolchain <path/to/file>" command-line
  option to specify a toolchain file.

* "cmake(1)" "-E capabilities" output, for some generators, may now
  contain a "supportedPlatforms" field listing platforms known to be
  supported in "CMAKE_GENERATOR_PLATFORM".

* Messages printed to a terminal now may be colored by message type.

Compilers
---------

* The Fujitsu compiler is now supported using compiler id "Fujitsu" in
  traditional ("Trad") mode, and compiler id "FujitsuClang" in "Clang"
  mode.

Platforms
---------

* CMake now supports the MSYS runtime environment, much like CYGWIN.

File-Based API
--------------

* The "cmake-file-api(7)" "codemodel" version 2 "version" field has
  been updated to 2.3.

* The "cmake-file-api(7)" "codemodel" version 2 gained a new
  "directory" object containing directory-level information. This
  includes a list of installers generated by the "install()" command.

Commands
--------

* The "add_custom_command()" command "DEPFILE" option may now use
  "generator expressions", is now supported by Visual Studio Generators
  for VS 2012 and above, and is now supported by the "Xcode" generator.

* The "add_custom_command(TARGET)" command (for Build Events) gained
  support for resolving target-dependent generator expressions.

* The "build_command()" command gained a "PARALLEL_LEVEL" option.

* The "file(COPY_FILE)" command was added to copy a single file.

* The "file(GET_RUNTIME_DEPENDENCIES)" command gained new
  "POST_INCLUDE_FILES" and "POST_EXCLUDE_FILES" arguments.

* The "file(REAL_PATH)" command gained the option "EXPAND_TILDE" to
  replace any leading tilde with the path to the user's home
  directory.

* The "file(RENAME)" command learned to optionally capture failure in
  a result variable.  It also gained a "NO_REPLACE" option to fail if
  the destination exists.

* The "install()" command gained a new "IMPORTED_RUNTIME_ARTIFACTS"
  mode, which can be used to install the runtime artifacts of imported
  targets.

* The "install()" command gained a new "RUNTIME_DEPENDENCY_SET" mode,
  which can be used to install runtime dependencies using
  "file(GET_RUNTIME_DEPENDENCIES)".

* The "install(TARGETS)" command gained new "RUNTIME_DEPENDENCIES" and
  "RUNTIME_DEPENDENCY_SET" arguments, which can be used to install
  runtime dependencies using "file(GET_RUNTIME_DEPENDENCIES)".

* The "install(SCRIPT|CODE)" command supports a new option
  "ALL_COMPONENTS" which allows the corresponding code to run for
  every component of a per component installation.

* The "project()" command now sets variables "PROJECT_IS_TOP_LEVEL"
  and "<PROJECT-NAME>_IS_TOP_LEVEL" to indicate whether it was called
  in a top-level "CMakeLists.txt" file.

Variables
---------

* The "CMAKE_TOOLCHAIN_FILE" environment variable was added to provide
  a default value for the "CMAKE_TOOLCHAIN_FILE" variable.

Properties
----------

* The "IMPORTED_TARGETS" directory property was added to get a list of
  Imported Targets created in the current directory.

* The "XCODE_EMBED_APP_EXTENSIONS" target property was added to tell
  the "Xcode" generator to embed app extensions such as iMessage
  sticker packs. Aspects of the embedding can be customized with the
  "XCODE_EMBED_APP_EXTENSIONS_PATH",
  "XCODE_EMBED_APP_EXTENSIONS_CODE_SIGN_ON_COPY" and
  "XCODE_EMBED_APP_EXTENSIONS_REMOVE_HEADERS_ON_COPY" properties.

Modules
-------

* The "FindBLAS" and "FindLAPACK" modules learned to support the
  serial "Fujitsu_SSL2" and parallel "Fujitsu_SSL2BLAMP" libraries.

* The "FindDevIL" module now provides imported targets.

* The "FindIconv" module now has version support.

* The "FindIntl" module now has version support.

* The "FindMPI" module learned to support "Fujitsu" and "FujitsuClang"
  in both host and cross compiling modes.

* The "FindMsys" module was added to find MSYS installations. Like
  "FindCygwin", it is used automatically by some other find modules to
  locate UNIX-style tools on Windows.

* The "FindOpenMP" module learned to support "Fujitsu" and
  "FujitsuClang".

* The "FindVulkan" module gained imported targets "Vulkan::Headers"
  and "Vulkan::glslangValidator".

* The "UseJava" module command "add_jar" gained a "RESOURCES" option
  to allow explicit naming of resources with non-optional namespace.

* The "UseSWIG" module use now standard library naming conventions for
  the "CSharp" language. See policy "CMP0122".

* The "UseSWIG" module now supports using the "swig" tool to generate
  implicit dependencies with the "Xcode" generator.

Generator Expressions
---------------------

* A new "TARGET_RUNTIME_DLLS" generator expression was added.

CTest
-----

* "ctest(1)" gained documentation for its ability to capture
  Additional Test Measurements.

* "ctest(1)" learned to recognize files attached to a test at run
  time. Previously it was only possible to attach files to tests at
  configure time by using the "ATTACHED_FILES" or
  "ATTACHED_FILES_ON_FAIL" test properties. See Additional Test
  Measurements for more information.

* "ctest(1)" gained a "--output-junit" option to write test results to
  a JUnit XML file.

* The "ctest_build()" command gained a "PARALLEL_LEVEL" option.

CPack
-----

* The "CPack DragNDrop Generator" gained option "CPACK_DMG_FILESYSTEM"
  to control the ".dmg" filesystem.

* The "CPack IFW Generator" now supports hyphens in names given to
  "cpack_ifw_configure_component()" or
  "cpack_ifw_configure_component_group()" as "DEPENDS" or
  "DEPENDENCIES" arguments.  This requires QtIFW 3.1 or later.

* The "CPack NSIS Generator" gained a new "CPACK_NSIS_EXECUTABLE"
  variable to specify the "makensis" executable to use instead of the
  default one.

* The "CPACK_CUSTOM_INSTALL_VARIABLES" variable was added to set
  variables in "cmake_install.cmake" script invocations made by CPack.

Deprecated and Removed Features
===============================

* Undocumented "CMAKE_SYSTEM_NAME" version-stripping behavior has been
  removed entirely. If it is set by a "-D" flag or by a "toolchain
  file", it is left unaltered, even if it still contains a version
  number. Similar "CMAKE_HOST_SYSTEM_NAME" version-stripping behavior,
  also undocumented, has been moved earlier, before "project()" or
  "enable_language()" is called.

* "ARMClang" cpu/arch compile and link flags are no longer added
  automatically based on the "CMAKE_SYSTEM_PROCESSOR" variable or the
  undocumented "CMAKE_SYSTEM_ARCH" variable. They must be specified
  explicitly.  See policy "CMP0123".

Other Changes
=============

* The "find_file()", "find_path()", "find_program()", and
  "find_library()" commands handle cache variables in the same way
  regardless how they are defined. See policy "CMP0125" for details.

* The "find_file()", "find_path()", "find_program()", and
  "find_library()" commands gained the option "NO_CACHE" to store find
  result in normal variable.

* The "foreach()" command now isolates loop variables in the loop
  scope. See policy "CMP0124" for details.

* The "list()" command's "GET", "INSERT", "SUBLIST", and "REMOVE_AT"
  subcommands now error with invalid (i.e., non-integer) values are
  given as any of their index arguments based on the setting of policy
  "CMP0121".

* The "set(CACHE)" command no longer removes a normal variable of the
  same name, if any. See policy "CMP0126".

* "target_link_libraries()" calls referencing object libraries via the
  "TARGET_OBJECTS" generator expression now place the object files
  before all libraries on the link line, regardless of their specified
  order.  See documentation on Linking Object Libraries via
  $<TARGET_OBJECTS> for details.

* The Ninja Generators now pass source files and include directories
  to the compiler using absolute paths.  This makes diagnostic
  messages and debug symbols more consistent, and matches the Makefile
  Generators.

* The "NMake Makefiles" generator now encodes the generated makefiles
  as UTF-8 with a BOM when using "nmake" from VS 9 or above.

* The Visual Studio Generators for VS 2010 and above now place per-
  source preprocessor definitions after target-wide preprocssor
  definitions.  This makes VS consistent with the Ninja Generators and
  the Makefile Generators.

* The precompiled binaries provided on cmake.org now support "liblzma"
  multi-threading.  See the "CPACK_THREADS" and
  "CPACK_ARCHIVE_THREADS" variables.

3 files changed, 79 insertions, 9 deletions

diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index c3198d1f84b..c38f75870d6 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.65 2021/03/31 07:43:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.66 2021/07/29 11:37:40 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -166,10 +166,12 @@ share/cmake-${CMAKE_API}/Help/envvar/CMAKE_GENERATOR_INSTANCE.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_GENERATOR_PLATFORM.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_GENERATOR_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_LANG_COMPILER_LAUNCHER.rst
+share/cmake-${CMAKE_API}/Help/envvar/CMAKE_LANG_LINKER_LAUNCHER.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_MSVCIDE_RUN_PATH.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_NO_VERBOSE.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_PREFIX_PATH.rst
+share/cmake-${CMAKE_API}/Help/envvar/CMAKE_TOOLCHAIN_FILE.rst
 share/cmake-${CMAKE_API}/Help/envvar/CSFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/CTEST_INTERACTIVE_DEBUG_MODE.rst
 share/cmake-${CMAKE_API}/Help/envvar/CTEST_OUTPUT_ON_FAILURE.rst
@@ -187,6 +189,8 @@ share/cmake-${CMAKE_API}/Help/envvar/DESTDIR.rst
 share/cmake-${CMAKE_API}/Help/envvar/ENV_VAR.txt
 share/cmake-${CMAKE_API}/Help/envvar/FC.rst
 share/cmake-${CMAKE_API}/Help/envvar/FFLAGS.rst
+share/cmake-${CMAKE_API}/Help/envvar/HIPCXX.rst
+share/cmake-${CMAKE_API}/Help/envvar/HIPFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/ISPC.rst
 share/cmake-${CMAKE_API}/Help/envvar/ISPCFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/LDFLAGS.rst
@@ -213,12 +217,14 @@ share/cmake-${CMAKE_API}/Help/generator/Ninja.rst
 share/cmake-${CMAKE_API}/Help/generator/Sublime Text 2.rst
 share/cmake-${CMAKE_API}/Help/generator/Unix Makefiles.rst
 share/cmake-${CMAKE_API}/Help/generator/VS_TOOLSET_HOST_ARCH.txt
+share/cmake-${CMAKE_API}/Help/generator/VS_TOOLSET_HOST_ARCH_LEGACY.txt
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 10 2010.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 11 2012.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 12 2013.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 14 2015.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 15 2017.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 16 2019.rst
+share/cmake-${CMAKE_API}/Help/generator/Visual Studio 17 2022.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 6.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 7 .NET 2003.rst
 share/cmake-${CMAKE_API}/Help/generator/Visual Studio 7.rst
@@ -419,6 +425,7 @@ share/cmake-${CMAKE_API}/Help/module/FindMPEG2.rst
 share/cmake-${CMAKE_API}/Help/module/FindMPI.rst
 share/cmake-${CMAKE_API}/Help/module/FindMatlab.rst
 share/cmake-${CMAKE_API}/Help/module/FindMotif.rst
+share/cmake-${CMAKE_API}/Help/module/FindMsys.rst
 share/cmake-${CMAKE_API}/Help/module/FindODBC.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenACC.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenAL.rst
@@ -648,6 +655,12 @@ share/cmake-${CMAKE_API}/Help/policy/CMP0117.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0118.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0119.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0120.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0121.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0122.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0123.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0124.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0125.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0126.rst
 share/cmake-${CMAKE_API}/Help/policy/DEPRECATED.txt
 share/cmake-${CMAKE_API}/Help/policy/DISALLOWED_COMMAND.txt
 share/cmake-${CMAKE_API}/Help/prop_cache/ADVANCED.rst
@@ -669,6 +682,7 @@ share/cmake-${CMAKE_API}/Help/prop_dir/COMPILE_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/DEFINITIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/EXCLUDE_FROM_ALL.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst
+share/cmake-${CMAKE_API}/Help/prop_dir/IMPORTED_TARGETS.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/INCLUDE_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/INCLUDE_REGULAR_EXPRESSION.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION.rst
@@ -697,6 +711,7 @@ share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOMOC_SOURCE_GROUP.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOMOC_TARGETS_FOLDER.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/AUTORCC_SOURCE_GROUP.rst
+share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOUIC_SOURCE_GROUP.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/CMAKE_CUDA_KNOWN_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
@@ -923,6 +938,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/GHS_INTEGRITY_APP.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/GHS_NO_SOURCE_GROUP_FILE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/GNUtoMS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/HAS_CXX.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/HIP_ARCHITECTURES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_COMMON_LANGUAGE_RUNTIME.rst
@@ -984,6 +1000,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_CPPCHECK.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_CPPLINT.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_INCLUDE_WHAT_YOU_USE.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_LINKER_LAUNCHER.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_VISIBILITY_PRESET.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst
@@ -1120,7 +1137,9 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_EMBED_type.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_EMBED_type_CODE_SIGN_ON_COPY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_EMBED_type_PATH.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_EMBED_type_REMOVE_HEADERS_ON_COPY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_GENERATE_SCHEME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_LINK_BUILD_PHASE_MODE.rst
@@ -1163,6 +1182,7 @@ share/cmake-${CMAKE_API}/Help/release/3.18.rst
 share/cmake-${CMAKE_API}/Help/release/3.19.rst
 share/cmake-${CMAKE_API}/Help/release/3.2.rst
 share/cmake-${CMAKE_API}/Help/release/3.20.rst
+share/cmake-${CMAKE_API}/Help/release/3.21.rst
 share/cmake-${CMAKE_API}/Help/release/3.3.rst
 share/cmake-${CMAKE_API}/Help/release/3.4.rst
 share/cmake-${CMAKE_API}/Help/release/3.5.rst
@@ -1312,6 +1332,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_ENABLE_EXPORTS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ERROR_DEPRECATED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXECUTABLE_SUFFIX_LANG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXECUTE_PROCESS_COMMAND_ECHO.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
@@ -1370,6 +1391,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_GLOBAL_AUTOGEN_TARGET_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_GLOBAL_AUTORCC_TARGET.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_GLOBAL_AUTORCC_TARGET_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_GNUtoMS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_HIP_ARCHITECTURES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOME_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_APPLE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_SOLARIS.rst
@@ -1453,6 +1475,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_IMPLICIT_LINK_FRAMEWORK_DIRECT
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_IMPLICIT_LINK_LIBRARIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_INCLUDE_WHAT_YOU_USE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_LIBRARY_ARCHITECTURE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_LINKER_LAUNCHER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_LINKER_PREFERENCE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_LINKER_PREFERENCE_PROPAGATES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_LINKER_WRAPPER_FLAG.rst
@@ -1597,6 +1620,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Swift_MODULE_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Swift_NUM_THREADS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_TLS_VERIFY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TOOLCHAIN_FILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TRY_COMPILE_CONFIGURATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst
@@ -1666,6 +1690,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_WORKING_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/variable/CPACK_CUSTOM_INSTALL_VARIABLES.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst
@@ -1732,6 +1757,7 @@ share/cmake-${CMAKE_API}/Help/variable/CTEST_P4_UPDATE_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_RESOURCE_SPEC_FILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_RUN_CURRENT_SCRIPT.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_SCP_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_SCRIPT_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_SITE.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_SOURCE_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_SUBMIT_URL.rst
@@ -1770,6 +1796,7 @@ share/cmake-${CMAKE_API}/Help/variable/MSYS.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_BINARY_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_DESCRIPTION.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_HOMEPAGE_URL.rst
+share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_IS_TOP_LEVEL.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_SOURCE_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_VERSION_MAJOR.rst
@@ -1779,6 +1806,7 @@ share/cmake-${CMAKE_API}/Help/variable/PROJECT-NAME_VERSION_TWEAK.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_BINARY_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_DESCRIPTION.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_HOMEPAGE_URL.rst
+share/cmake-${CMAKE_API}/Help/variable/PROJECT_IS_TOP_LEVEL.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_SOURCE_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/PROJECT_VERSION.rst
@@ -1851,6 +1879,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerABI.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerId.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineFortranCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeDetermineHIPCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineISPCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineJavaCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineOBJCCompiler.cmake
@@ -1880,6 +1909,11 @@ share/cmake-${CMAKE_API}/Modules/CMakeFortranCompilerId.F.in
 share/cmake-${CMAKE_API}/Modules/CMakeFortranInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeGenericSystem.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeGraphVizOptions.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeHIPCompiler.cmake.in
+share/cmake-${CMAKE_API}/Modules/CMakeHIPCompilerABI.hip
+share/cmake-${CMAKE_API}/Modules/CMakeHIPCompilerId.hip.in
+share/cmake-${CMAKE_API}/Modules/CMakeHIPInformation.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeHIPRuntime.cmake.in
 share/cmake-${CMAKE_API}/Modules/CMakeIOSInstallCombined.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeISPCCompiler.cmake.in
 share/cmake-${CMAKE_API}/Modules/CMakeISPCCompilerABI.ispc
@@ -1930,6 +1964,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeTestCXXCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestCompilerCommon.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestFortranCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestGNU.c
+share/cmake-${CMAKE_API}/Modules/CMakeTestHIPCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestISPCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestJavaCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestOBJCCompiler.cmake
@@ -2038,6 +2073,7 @@ share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-FindBinUtils.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Clang-HIP.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-OBJC.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-OBJCXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang.cmake
@@ -2056,7 +2092,16 @@ share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Flang-FindBinUtils.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Flang-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Fujitsu-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Fujitsu-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Fujitsu-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Fujitsu.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/FujitsuClang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/FujitsuClang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/FujitsuClang-FindBinUtils.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/FujitsuClang.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/G95-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GHS-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GHS-CXX.cmake
@@ -2084,7 +2129,6 @@ share/cmake-${CMAKE_API}/Modules/Compiler/IAR-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IAR-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IAR-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IAR-DetermineCompiler.cmake
-share/cmake-${CMAKE_API}/Modules/Compiler/IAR-FindBinUtils.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IAR.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake
@@ -2137,6 +2181,15 @@ share/cmake-${CMAKE_API}/Modules/Compiler/QCC-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/QCC-CXX-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/QCC-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/QCC.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ROCMClang-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ROCMClang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ROCMClang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ROCMClang-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ROCMClang-FindBinUtils.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ROCMClang-HIP.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ROCMClang-OBJC.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ROCMClang-OBJCXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ROCMClang.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SCO-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SCO-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/SCO-DetermineCompiler.cmake
@@ -2291,6 +2344,7 @@ share/cmake-${CMAKE_API}/Modules/FindMPI/test_mpi.c
 share/cmake-${CMAKE_API}/Modules/FindMPI/test_mpi.f90.in
 share/cmake-${CMAKE_API}/Modules/FindMatlab.cmake
 share/cmake-${CMAKE_API}/Modules/FindMotif.cmake
+share/cmake-${CMAKE_API}/Modules/FindMsys.cmake
 share/cmake-${CMAKE_API}/Modules/FindODBC.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenACC.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenAL.cmake
@@ -2631,6 +2685,9 @@ share/cmake-${CMAKE_API}/Modules/Platform/Linux-CCur-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Clang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Determine-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-Fujitsu-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-Fujitsu-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-Fujitsu.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-GNU-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-GNU-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-GNU-Fortran.cmake
@@ -2670,6 +2727,15 @@ share/cmake-${CMAKE_API}/Modules/Platform/Linux-XL-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-como.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/MP-RAS.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/MSYS-Clang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/MSYS-Clang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/MSYS-Determine-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/MSYS-GNU-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/MSYS-GNU-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/MSYS-GNU-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/MSYS-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/MSYS-windres.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/MSYS.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Midipix.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/MirBSD.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/NetBSD.cmake
@@ -2835,6 +2901,7 @@ share/cmake-${CMAKE_API}/Templates/CPack.GenericLicense.txt
 share/cmake-${CMAKE_API}/Templates/CPack.GenericWelcome.txt
 share/cmake-${CMAKE_API}/Templates/CPackConfig.cmake.in
 share/cmake-${CMAKE_API}/Templates/CTestScript.cmake.in
+share/cmake-${CMAKE_API}/Templates/MSBuild/CustomBuildDepFile.targets
 share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v10_CL.json
 share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v10_CSharp.json
 share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v10_Cuda.json
@@ -2865,6 +2932,9 @@ share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v141_Link.json
 share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v142_CL.json
 share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v142_CSharp.json
 share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v142_Link.json
+share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v143_CL.json
+share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v143_CSharp.json
+share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v143_Link.json
 share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v14_LIB.json
 share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v14_MASM.json
 share/cmake-${CMAKE_API}/Templates/MSBuild/FlagTables/v14_RC.json
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 02fca9cceab..2c887f29186 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.181 2021/07/15 21:10:53 jperkin Exp $
+$NetBSD: distinfo,v 1.182 2021/07/29 11:37:40 adam Exp $
 
-SHA1 (cmake-3.20.5.tar.gz) = 42b43d0a5d82285384db8d17b5bd5dd9cc3fc6a2
-RMD160 (cmake-3.20.5.tar.gz) = 8737df0ceeb6d3d8ec94a907d7fcf475a69feffc
-SHA512 (cmake-3.20.5.tar.gz) = 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
-Size (cmake-3.20.5.tar.gz) = 9441947 bytes
+SHA1 (cmake-3.21.1.tar.gz) = dc87838c0810558cd6010aafc93638af21f1818a
+RMD160 (cmake-3.21.1.tar.gz) = 208767c3f235b47bd2e9e4ae021a04972f3cb52f
+SHA512 (cmake-3.21.1.tar.gz) = 1453b1f5139950f501c570c305257e4e5dacb8224944de8ed1489aae162c6dd75fe1cd5188d619c47e4e53ca5b846f07318ffb3ab004a0547f2c8b13f60083b4
+Size (cmake-3.21.1.tar.gz) = 9629567 bytes
 SHA1 (patch-CMakeLists.txt) = fabdb0590f4b97c34c2242749ae3b6af18aefc0a
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
 SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0
diff --git a/devel/cmake/version.mk b/devel/cmake/version.mk
index 53dfead93d4..0298c45f8e8 100644
--- a/devel/cmake/version.mk
+++ b/devel/cmake/version.mk
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.17 2021/06/24 09:30:55 adam Exp $
+# $NetBSD: version.mk,v 1.18 2021/07/29 11:37:40 adam Exp $
 # used by devel/cmake/Makefile.common
 # used by devel/cmake-fedora/Makefile
 
-CMAKE_VERSION=	3.20.5
+CMAKE_VERSION=	3.21.1
 CMAKE_API=	${CMAKE_VERSION:R}