[pkgsrc/trunk]: pkgsrc/devel/cmake cmake cmake-gui: updated to 3.20.0

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/690ee0b24379
branches:  trunk
changeset: 449465:690ee0b24379
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Mar 31 07:43:39 2021 +0000

description:
cmake cmake-gui: updated to 3.20.0

CMake 3.20 Release Notes
************************

Changes made since CMake 3.19 include the following.


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

Presets
-------

* "cmake-presets(7)" gained support for build and test presets.

Generators
----------

* Makefile Generators, for some toolchains, now use the compiler to
  extract implicit dependencies while compiling source files.

Languages
---------

* C++23 compiler modes may now be specified via the "CXX_STANDARD",
  "CUDA_STANDARD", or "OBJCXX_STANDARD" target properties, or via the
  "Compile Features" functionality’s "cxx_std_23" meta-feature.

* "CUDA" language support now works when "nvcc" is a symbolic link,
  for example due to a "ccache" or "colornvcc" wrapper script.

* The "CUDAARCHS" environment variable was added for initializing
  "CMAKE_CUDA_ARCHITECTURES". Useful in cases where the compiler
  default is unsuitable for the machine’s GPU.

Compilers
---------

* The NVIDIA HPC SDK compilers are now supported with compiler id
  "NVHPC".

* The Intel oneAPI NextGen LLVM compilers are now supported with
  compiler id "IntelLLVM":

  * The "icx"/"icpx" C/C++ compilers on Linux, and the "icx" C/C++
    compiler on Windows, are fully supported as of oneAPI 2021.1.

  * The "ifx" Fortran compiler on Linux is partially supported. As of
    oneAPI 2021.1, "ifx" does not define several identification
    macros, so CMake identifies it as the classic "Intel" compiler.
    This works in many cases because "ifx" accepts the same command
    line parameters as "ifort".  A future version of oneAPI may fix
    this.

  * The "ifx" Fortran compiler on Windows is not yet supported.

  The Intel oneAPI Classic compilers ("icc", "icpc", and "ifort")
  continue to be supported with compiler id "Intel".

* Support was added for the IAR STM8 compiler.

Platforms
---------

* CMake’s support for Cross Compiling for Android is now merged with
  the Android NDK’s toolchain file. They now have similar behavior,
  though some variable names differ. User-facing changes include:

  * "find_*" functions will search NDK ABI / API specific paths by
    default.

  * The default "CMAKE_BUILD_TYPE" for Android is now
    "RelWithDebInfo".

  * The "CMAKE_ANDROID_NDK_VERSION" variable was added to report the
    version of the NDK.

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

* The "cmake-file-api(7)" gained a new “toolchains” object kind that
  describes the compiler used for each enabled language.

Commands
--------

* "add_custom_command()" and "add_custom_target()" now support
  "generator expressions" in their "OUTPUT" and "BYPRODUCTS" options.

  Their "COMMAND", "WORKING_DIRECTORY", and "DEPENDS" options gained
  support for new generator expressions "<COMMAND_CONFIG:...>" and
  "<OUTPUT_CONFIG:...>" that control cross-config handling when using
  the "Ninja Multi-Config" generator.

* The "add_custom_command()" command gained "DEPFILE" support on
  Makefile Generators.

* The "add_library()" command previously prohibited imported object
  libraries when using potentially multi-architecture configurations.
  This mostly affected the "Xcode" generator, e.g. when targeting iOS
  or one of the other device platforms.  This restriction has now been
  removed.

* The "cmake_path()" command was added for operations on filesystem
  paths.

* The "configure_file()" command gained "USE_SOURCE_PERMISSIONS" and
  "FILE_PERMISSIONS" options to support copying of permissions of the
  source file and using specified permissions respectively.

* The "file(GENERATE)" command gained a "NEWLINE_STYLE" option to
  specify how newlines are handled for the generated file.

* The "file(GENERATE)" command gained "NO_SOURCE_PERMISSIONS",
  "USE_SOURCE_PERMISSIONS", and "FILE_PERMISSIONS" options for
  controlling the permissions of the generated file.

* The "install(FILES)" command "RENAME" option learned to support
  "generator expressions".

* The "target_include_directories()" command gained a new option
  "AFTER".

* The "target_sources()" command now supports targets created by the
  "add_custom_target()" command.

* The "try_run()" command gained a "WORKING_DIRECTORY" option to set
  the working directory in which to run the compiled check executable.

Variables
---------

* The "CMAKE_<LANG>_BYTE_ORDER" variable was added to provide the
  target architecture byte order detected from the toolchain.

* The "CMAKE_RUNTIME_OUTPUT_DIRECTORY",
  "CMAKE_LIBRARY_OUTPUT_DIRECTORY", and
  "CMAKE_ARCHIVE_OUTPUT_DIRECTORY" variables now support target-
  dependent generator expressions.

Properties
----------

* The "<LANG>_CLANG_TIDY" target property and the associated
  "CMAKE_<LANG>_CLANG_TIDY" variable learned to support the "OBJC" and
  "OBJCXX" languages.

* The "EXPORT_COMPILE_COMMANDS" target property was added for the
  associated "CMAKE_EXPORT_COMPILE_COMMANDS" variable to allow for
  configuration of exporting compile commands per target.

* The "GENERATED" source-file property is now visible from any
  directory scope, regardless of the scope in which it is set. See
  policy "CMP0118".

* The "UNITY_BUILD_UNIQUE_ID" target property was added to support
  generation of an identifier that is unique per source file in unity
  builds.  It can help to resolve duplicate symbol problems with
  anonymous namespaces.

* The "WIN32_EXECUTABLE" target property now works with Clang on
  Windows.

* The "XCODE_EMBED_FRAMEWORKS" target property was added to tell the
  "Xcode" generator to embed frameworks. Aspects of the embedding can
  be customized with the "XCODE_EMBED_FRAMEWORKS_PATH",
  "XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY", and
  "XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY" target properties.

Modules
-------

* The "ExternalData" module "ExternalData_Add_Target()" function
  gained a "SHOW_PROGRESS <bool>" option for controlling whether or
  not to show progress output during the build.

* The "ExternalProject" module "ExternalProject_Add()" function gained
  a "CONFIGURE_HANDLED_BY_BUILD" option.  This can be used to make
  subsequent runs of the configure step be triggered by the build step
  when an external project dependency rebuilds instead of always re-
  running the configure step in such cases.

* The "FindBoost" module gained a "Boost_NO_WARN_NEW_VERSIONS" option
  to silence the warning about unknown dependencies for new Boost
  versions.

* The "FindCUDAToolkit" module gained support for finding CUDA
  toolkits when "nvcc" is a symbolic link, for example due to a
  "ccache" or "colornvcc" wrapper script.

* The "FindGDAL" module has been improved to document and mark as
  advanced its cache variables. There is a new
  "FindGDAL_SKIP_GDAL_CONFIG" variable which may be used to skip over
  the "gdal-config"-based search. Users may also set
  "GDAL_ADDITIONAL_LIBRARY_VERSIONS" to add additional versions to the
  library name search strategy.

* The "FindIntl" module now provides an imported target.

* The "FindOpenSSL" module learned to support a version range.

* The "FindPython3", "FindPython2" and "FindPython" modules gained
  options controlling how unversioned interpreter names are searched.

* The "UseJava" module "add_jar()" command’s "GENERATE_NATIVE_HEADERS"
  feature gained options to export the generated target.

* The "UseSWIG" module gained the capability, for Makefile and Ninja
  generators, to use the "swig" tool to generate implicit
  dependencies.

Autogen
-------

* The AUTOMOC feature now works with per-config sources.

CTest
-----

* "ctest(1)" gained a "--test-dir" option to specify the directory in
  which to look for tests.

CPack
-----

* "CPack" gained the "CPACK_THREADS" variable to control the number of
  threads used for parallelized operations, such as compressing the
  installer package.

* The "CPack DEB Generator" learned a new
  "CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS" variable to specify
  additional search directories for resolving private library
  dependencies when using "dpkg-shlibdeps".

* The "CPack IFW Generator" gained a new
  "CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST" variable to control
  visibility of the widget listing installer pages on the left side of
  the wizard. This feature available only since QtIFW 4.0.

* The "CPack NSIS Generator" gained new "CPACK_NSIS_BRANDING_TEXT" and
  "CPACK_NSIS_BRANDING_TEXT_TRIM_POSITION" variables to change the
  text at the bottom of the install window and change its trim
  position

* The "CPack NSIS Generator" now correctly handles Unicode characters.
  If you want to have a "CPACK_RESOURCE_FILE_LICENSE" with UTF-8
  characters, it needs to be encoded in UTF-8 BOM.

* The "CPack NuGet Generator" gained options:

  * "CPACK_NUGET_PACKAGE_ICON" and
    "CPACK_NUGET_<compName>_PACKAGE_ICON" allow package icons to be
    specified by local files.

  * "CPACK_NUGET_PACKAGE_LICENSE_EXPRESSION" and
    "CPACK_NUGET_<compName>_PACKAGE_LICENSE_EXPRESSION" add support
    for specifying licenses recognized by the Software Package Data
    Exchange (SPDX).

  * "CPACK_NUGET_PACKAGE_LICENSE_FILE_NAME" and
    "CPACK_NUGET_<compName>_PACKAGE_LICENSE_FILE_NAME" allow licenses
    to be specified by local files.

  * "CPACK_NUGET_PACKAGE_LANGUAGE" and
    "CPACK_NUGET_<compName>_PACKAGE_LANGUAGE" allow the locale for a
    package to be specified, for example "en_CA".

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

* The "cmake-server(7)" mode has been removed. Clients should use the
  "cmake-file-api(7)" instead.

* The "WriteCompilerDetectionHeader" module has been deprecated via
  policy "CMP0120".  Projects should be ported away from it.

* The "TestBigEndian" module has been deprecated in favor of the
  "CMAKE_<LANG>_BYTE_ORDER" variable.

* The "AddFileDependencies" module is deprecated. Port projects to use
  "set_property()" directly.

* The "CPack NuGet Generator" deprecated some variables to reflect
  changes in the NuGet specification:

  * "CPACK_NUGET_PACKAGE_ICONURL" and
    "CPACK_NUGET_<compName>_PACKAGE_ICONURL" have been deprecated;
    replace with a reference to a local icon file.

  * "CPACK_NUGET_PACKAGE_LICENSEURL" and
    "CPACK_NUGET_<compName>_PACKAGE_LICENSEURL" have been deprecated;
    replace with a reference to the project’s license file or SPDX
    license expression.

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

* Source file extensions must now be explicit. See policy "CMP0115"
  for details.

* The "LANGUAGE" source file property now forces compilation as the
  specified language.  See policy "CMP0119".

* On AIX, installation of XCOFF executables and shared libraries no
  longer requires relinking to change the runtime search path from the
  build-tree RPATH to the install-tree RPATH.  CMake now edits the
  XCOFF binaries directly during installation, as has long been done
  on ELF platforms.

* With MSVC-like compilers the value of "CMAKE_CXX_FLAGS" no longer
  contains the "/GR" flag for runtime type information by default. See
  policy "CMP0117".

* Ninja generators now transform the "DEPFILE" generated by an
  "add_custom_command()". See policy "CMP0116" for details.

* The precompiled Linux binaries provided on cmake.org have changed
  their naming pattern to "cmake-$ver-linux-$arch", where "$arch" is
  either "x86_64" or "aarch64".

* The precompiled Windows binaries provided on cmake.org have changed
  their naming pattern to "cmake-$ver-windows-$arch", where "$arch" is
  either "x86_64" or "i386".

diffstat:

 devel/cmake/Makefile                                     |   4 +-
 devel/cmake/PLIST                                        |  58 ++++++++++++++-
 devel/cmake/distinfo                                     |  13 +-
 devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt |  14 +-
 devel/cmake/version.mk                                   |   4 +-
 5 files changed, 72 insertions(+), 21 deletions(-)

diffs (truncated from 317 to 300 lines):

diff -r 7de2ac4d08ce -r 690ee0b24379 devel/cmake/Makefile
--- a/devel/cmake/Makefile      Wed Mar 31 06:36:50 2021 +0000
+++ b/devel/cmake/Makefile      Wed Mar 31 07:43:39 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.179 2020/11/25 10:33:28 adam Exp $
+# $NetBSD: Makefile,v 1.180 2021/03/31 07:43:39 adam Exp $
 
 .include "Makefile.common"
 
@@ -46,7 +46,7 @@
        ${CP} ${FILESDIR}/Source_Checks_cm_cxx_cbegin.cxx ${WRKSRC}/Source/Checks/cm_cxx_cbegin.cxx
        ${CP} ${FILESDIR}/Source_Checks_cm_cxx_cend.cxx ${WRKSRC}/Source/Checks/cm_cxx_cend.cxx
        ${CP} ${FILESDIR}/Source_Checks_cm_cxx_size_t.cxx ${WRKSRC}/Source/Checks/cm_cxx_size_t.cxx
-       ${RM} -f ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Compiler/*.orig ${WRKSRC}/Modules/Platform/*.orig  ${WRKSRC}/Modules/FindPython/*.orig
+       ${RM} -f ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Compiler/*.orig ${WRKSRC}/Modules/Platform/*.orig ${WRKSRC}/Modules/FindPython/*.orig
        ${LN} -f ${WRKSRC}/Modules/Platform/OpenBSD.cmake ${WRKSRC}/Modules/Platform/MirBSD.cmake
 .for lang in C CXX Fortran
        ${LN} -f ${WRKSRC}/Modules/Platform/SunOS-GNU-${lang}.cmake \
diff -r 7de2ac4d08ce -r 690ee0b24379 devel/cmake/PLIST
--- a/devel/cmake/PLIST Wed Mar 31 06:36:50 2021 +0000
+++ b/devel/cmake/PLIST Wed Mar 31 07:43:39 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.64 2020/12/17 12:14:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.65 2021/03/31 07:43:39 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -32,6 +32,7 @@
 share/cmake-${CMAKE_API}/Help/command/cmake_language.rst
 share/cmake-${CMAKE_API}/Help/command/cmake_minimum_required.rst
 share/cmake-${CMAKE_API}/Help/command/cmake_parse_arguments.rst
+share/cmake-${CMAKE_API}/Help/command/cmake_path.rst
 share/cmake-${CMAKE_API}/Help/command/cmake_policy.rst
 share/cmake-${CMAKE_API}/Help/command/configure_file.rst
 share/cmake-${CMAKE_API}/Help/command/continue.rst
@@ -175,6 +176,7 @@
 share/cmake-${CMAKE_API}/Help/envvar/CTEST_PARALLEL_LEVEL.rst
 share/cmake-${CMAKE_API}/Help/envvar/CTEST_PROGRESS_OUTPUT.rst
 share/cmake-${CMAKE_API}/Help/envvar/CTEST_USE_LAUNCHERS_DEFAULT.rst
+share/cmake-${CMAKE_API}/Help/envvar/CUDAARCHS.rst
 share/cmake-${CMAKE_API}/Help/envvar/CUDACXX.rst
 share/cmake-${CMAKE_API}/Help/envvar/CUDAFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/CUDAHOSTCXX.rst
@@ -640,6 +642,12 @@
 share/cmake-${CMAKE_API}/Help/policy/CMP0112.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0113.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0114.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0115.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0116.rst
+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/DEPRECATED.txt
 share/cmake-${CMAKE_API}/Help/policy/DISALLOWED_COMMAND.txt
 share/cmake-${CMAKE_API}/Help/prop_cache/ADVANCED.rst
@@ -899,6 +907,7 @@
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXCLUDE_FROM_ALL.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/EXPORT_COMPILE_COMMANDS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXPORT_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXPORT_PROPERTIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EchoString.rst
@@ -1064,6 +1073,7 @@
 share/cmake-${CMAKE_API}/Help/prop_tgt/UNITY_BUILD_CODE_AFTER_INCLUDE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/UNITY_BUILD_CODE_BEFORE_INCLUDE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/UNITY_BUILD_MODE.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/UNITY_BUILD_UNIQUE_ID.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
@@ -1107,6 +1117,10 @@
 share/cmake-${CMAKE_API}/Help/prop_tgt/WIN32_EXECUTABLE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst
 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_PATH.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
@@ -1148,6 +1162,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.3.rst
 share/cmake-${CMAKE_API}/Help/release/3.4.rst
 share/cmake-${CMAKE_API}/Help/release/3.5.rst
@@ -1172,6 +1187,7 @@
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ARM_MODE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ARM_NEON.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ASSETS_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_EXCEPTIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_GUI.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_JAR_DEPENDENCIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_JAR_DIRECTORIES.rst
@@ -1182,9 +1198,11 @@
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NDK_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_PROGUARD.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_PROGUARD_CONFIG_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_RTTI.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_SECURE_PROPS_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_SKIP_ANT_STEP.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_STANDALONE_TOOLCHAIN.rst
@@ -1277,6 +1295,7 @@
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DEFAULT_BUILD_TYPE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DEFAULT_CONFIGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_DEPENDS_USE_COMPILER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DIRECTORY_LABELS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DISABLE_PRECOMPILE_HEADERS.rst
@@ -1394,6 +1413,7 @@
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ARCHIVE_CREATE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ARCHIVE_FINISH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_BYTE_ORDER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_CLANG_TIDY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_ABI.rst
@@ -1584,6 +1604,7 @@
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TWEAK_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_UNITY_BUILD.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_UNITY_BUILD_BATCH_SIZE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_UNITY_BUILD_UNIQUE_ID.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_USE_RELATIVE_PATHS.rst
@@ -1886,6 +1907,7 @@
 share/cmake-${CMAKE_API}/Modules/CMakeParseArguments.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeParseImplicitIncludeInfo.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeParseImplicitLinkInfo.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeParseLibraryArchitecture.cmake
 share/cmake-${CMAKE_API}/Modules/CMakePlatformId.h.in
 share/cmake-${CMAKE_API}/Modules/CMakePrintHelpers.cmake
 share/cmake-${CMAKE_API}/Modules/CMakePrintSystemInformation.cmake
@@ -2075,6 +2097,12 @@
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel-ISPC.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-C-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-C.cmake
@@ -2082,6 +2110,11 @@
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/NAG-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/NVHPC-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/NVHPC-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/NVHPC-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/NVHPC-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/NVHPC.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/NVIDIA-CUDA.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/OpenWatcom-C.cmake
@@ -2500,6 +2533,10 @@
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-Intel-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-Intel-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-Intel.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-IntelLLVM-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-IntelLLVM-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-IntelLLVM-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-IntelLLVM.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-NAG-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-NVIDIA-CUDA.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-PGI-C.cmake
@@ -2602,7 +2639,15 @@
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-IntelLLVM-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-IntelLLVM-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-IntelLLVM-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-IntelLLVM.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-NAG-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-NVHPC-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-NVHPC-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-NVHPC-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-NVHPC.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-OpenWatcom-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-OpenWatcom-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-OpenWatcom.cmake
@@ -2683,6 +2728,11 @@
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-ISPC.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-IntelLLVM-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-IntelLLVM-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-IntelLLVM-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-IntelLLVM-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-IntelLLVM.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-MSVC-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-MSVC-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-MSVC.cmake
@@ -2759,9 +2809,10 @@
 share/cmake-${CMAKE_API}/Modules/TestForSTDNamespace.cxx
 share/cmake-${CMAKE_API}/Modules/UseEcos.cmake
 share/cmake-${CMAKE_API}/Modules/UseJava.cmake
+share/cmake-${CMAKE_API}/Modules/UseJava/ClassFilelist.cmake
 share/cmake-${CMAKE_API}/Modules/UseJava/ClearClassFiles.cmake
-share/cmake-${CMAKE_API}/Modules/UseJavaClassFilelist.cmake
-share/cmake-${CMAKE_API}/Modules/UseJavaSymlinks.cmake
+share/cmake-${CMAKE_API}/Modules/UseJava/Symlinks.cmake
+share/cmake-${CMAKE_API}/Modules/UseJava/javaTargets.cmake.in
 share/cmake-${CMAKE_API}/Modules/UsePkgConfig.cmake
 share/cmake-${CMAKE_API}/Modules/UseQt4.cmake
 share/cmake-${CMAKE_API}/Modules/UseSWIG.cmake
@@ -2773,7 +2824,6 @@
 share/cmake-${CMAKE_API}/Modules/WriteCompilerDetectionHeader.cmake
 share/cmake-${CMAKE_API}/Modules/ecos_clean.cmake
 share/cmake-${CMAKE_API}/Modules/exportheader.cmake.in
-share/cmake-${CMAKE_API}/Modules/javaTargets.cmake.in
 share/cmake-${CMAKE_API}/Modules/kde3init_dummy.cpp.in
 share/cmake-${CMAKE_API}/Modules/kde3uic.cmake
 share/cmake-${CMAKE_API}/Modules/readme.txt
diff -r 7de2ac4d08ce -r 690ee0b24379 devel/cmake/distinfo
--- a/devel/cmake/distinfo      Wed Mar 31 06:36:50 2021 +0000
+++ b/devel/cmake/distinfo      Wed Mar 31 07:43:39 2021 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.174 2021/03/16 19:50:30 adam Exp $
+$NetBSD: distinfo,v 1.175 2021/03/31 07:43:39 adam Exp $
 
-SHA1 (cmake-3.19.7.tar.gz) = 225582b2bce63d2fe87ed41fc29e0381dc035967
-RMD160 (cmake-3.19.7.tar.gz) = 19bf214dd3899c5ca9710bb615c3e5d4005f93c8
-SHA512 (cmake-3.19.7.tar.gz) = 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
-Size (cmake-3.19.7.tar.gz) = 9271358 bytes
+SHA1 (cmake-3.20.0.tar.gz) = 559b4d731229bcd2ca5deec2cb2fb0498acfdd91
+RMD160 (cmake-3.20.0.tar.gz) = 94fedb0b622f9c47939f308f29c5ec8b6f469a3e
+SHA512 (cmake-3.20.0.tar.gz) = 1dc7c2813ea314f40a0e7bb45e1dbad523cd582d58f17649ff9f0737081767d4c301138ed026f17340f9ff8f4f77b52250d3c010454f30e24bd50be1744b04b4
+Size (cmake-3.20.0.tar.gz) = 9427538 bytes
 SHA1 (patch-CMakeLists.txt) = fabdb0590f4b97c34c2242749ae3b6af18aefc0a
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
 SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0
@@ -18,5 +18,6 @@
 SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac8204cb9fe75b8c
 SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b
 SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
-SHA1 (patch-Source_QtDialog_CMakeLists.txt) = b286fca47e221836c87b9812112cf973f98eaa82
+SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 0858da256bba174694a165d5f910eedb3faa06d5
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
+SHA1 (patch-bootstrap) = e34f5b888790e766338086b8c3680be79b71ef18
diff -r 7de2ac4d08ce -r 690ee0b24379 devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt
--- a/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt  Wed Mar 31 06:36:50 2021 +0000
+++ b/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt  Wed Mar 31 07:43:39 2021 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-Source_QtDialog_CMakeLists.txt,v 1.3 2021/01/16 11:16:25 adam Exp $
+$NetBSD: patch-Source_QtDialog_CMakeLists.txt,v 1.4 2021/03/31 07:43:39 adam Exp $
 
 Do not make app bundle on Darwin.
 
---- Source/QtDialog/CMakeLists.txt.orig        2021-01-13 12:58:18.000000000 +0000
+--- Source/QtDialog/CMakeLists.txt.orig        2021-03-23 15:43:17.000000000 +0000
 +++ Source/QtDialog/CMakeLists.txt
-@@ -161,14 +161,14 @@ target_link_libraries(CMakeGUILib PUBLIC
+@@ -243,14 +243,14 @@ target_link_libraries(CMakeGUILib PUBLIC
  add_library(CMakeGUIMainLib STATIC CMakeSetup.cxx)
  target_link_libraries(CMakeGUIMainLib PUBLIC CMakeGUILib)
  
 -add_executable(cmake-gui WIN32 MACOSX_BUNDLE CMakeGUIExec.cxx ${MANIFEST_FILE})
 +add_executable(cmake-gui WIN32 CMakeGUIExec.cxx ${MANIFEST_FILE})
- target_link_libraries(cmake-gui CMakeGUIMainLib Qt5::Core)
+ target_link_libraries(cmake-gui CMakeGUIMainLib Qt${INSTALLED_QT_VERSION}::Core)
  
  target_sources(CMakeGUIMainLib INTERFACE $<TARGET_OBJECTS:CMakeGUIQRCLib>)
  if(WIN32)
@@ -21,7 +21,7 @@
    target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.icns)
    set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
    set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -198,7 +198,7 @@ Checks: '-*,llvm-twine-local'
+@@ -280,7 +280,7 @@ Checks: '-*,llvm-twine-local'
  ...
  ")
  
@@ -30,7 +30,7 @@
    file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
      LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
  
-@@ -225,7 +225,7 @@ install(TARGETS cmake-gui
+@@ -307,7 +307,7 @@ install(TARGETS cmake-gui
    RUNTIME DESTINATION bin ${COMPONENT}
    ${CMAKE_INSTALL_DESTINATION_ARGS})
  
@@ -39,7 +39,7 @@
    foreach (size IN ITEMS 32 128)
      install(
        FILES       "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png"