CVS commit: pkgsrc/devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Nov 25 10:33:28 UTC 2020

Modified Files:
        pkgsrc/devel/cmake: Makefile PLIST distinfo version.mk
        pkgsrc/devel/cmake-gui: Makefile
        pkgsrc/devel/cmake/patches: patch-Modules_FindPython_Support.cmake
            patch-Source_QtDialog_CMakeLists.txt
Removed Files:
        pkgsrc/devel/cmake/patches: patch-Source_CursesDialog_ccmake.cxx
            patch-Utilities_std_cm_string__view patch-bootstrap

Log Message:
cmake cmake-gui: updated to 3.19.1

CMake 3.19.1

ci: update to use CMake 3.19.0
gitlab-ci: update macOS jobs to use Xcode 12.0
Revert “specify language flag when source LANGUAGE property is set”
FindGTest: Revert “Allow either “Debug” or “Release” configurations.”
Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule
Xcode: Fix custom command work-dir placeholders in “new build system”
Tests: Match RunCMake.CMP0111 stderr more strictly
cmTarget: Do not enforce CMP0111 on imported INTERFACE libraries
cmVisualStudio10TargetGenerator: Avoid GetFullPath on INTERFACE library
cmGlobalGenerator: FindMakeProgram() at a generator-specific time
cmFileTime: Fix overflow on time computation
Help: Fix ‘… versionadded’ directives for CTEST_CUSTOM_* variables
CUDA: Clang CUDA 11.1 support
CUDA: Error if can’t determine toolkit library root

CMake 3.19 Release Notes
************************

Changes made since CMake 3.18 include the following.

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

Presets
-------

* "cmake(1)" and "cmake-gui(1)" now recognize "CMakePresets.json" and
  "CMakeUserPresets.json" files (see "cmake-presets(7)").

Generators
----------

* The "Xcode" generator now uses the Xcode “new build system” when
  generating for Xcode 12.0 or higher. See the
  "CMAKE_XCODE_BUILD_SYSTEM" variable. One may use "-T buildsystem=1"
  to switch to the legacy build system.

* The "Xcode" generator gained support for linking libraries and
  frameworks via the *Link Binaries With Libraries* build phase
  instead of always by embedding linker flags directly.  This behavior
  is controlled by a new "XCODE_LINK_BUILD_PHASE_MODE" target
  property, which is initialized by a new
  "CMAKE_XCODE_LINK_BUILD_PHASE_MODE" variable.

* The Visual Studio Generators for VS 2015 and above gained support
  for the Visual Studio Tools for Android.  One may now set
  "CMAKE_SYSTEM_NAME" to "Android" to generate ".vcxproj" files for
  the Android tools.

Languages
---------

* CMake learned to support "ISPC" as a first-class language that can
  be enabled via the "project()" and "enable_language()" commands.
  "ISPC" is currently supported by the Makefile Generators and the
  "Ninja" generator on Linux, macOS, and Windows using the Intel ISPC
  compiler.

* "CUDA" language support for Clang now includes:

  * separable compilation ("CUDA_SEPARABLE_COMPILATION"), and

  * finding scattered toolkit installations when cross-compiling.

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

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

* The "cmake-file-api(7)" “codemodel” version 2 “target” object gained
  a new "languageStandard" field in the "compileGroups" objects.

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

* The "cmake(1)" command-line tool’s "--install" mode gained a "--
  default-directory-permissions" option.

* "cmake(1)" gained a "-E create_hardlink" command-line tool that can
  be used to create hardlinks between files.

GUI
---

* The "CMake GUI" now has an environment variable editor.

Commands
--------

* The "add_test()" command now (officially) supports whitespace and
  other special characters in the name for the test it creates. See
  policy "CMP0110".

* The "cmake_language()" command gained a "DEFER" mode to schedule
  command calls to occur at the end of processing a directory.

* The "configure_file()" command gained a "NO_SOURCE_PERMISSIONS"
  option to suppress copying the input file’s permissions to the
  output file.

* The "execute_process()" command gained a "COMMAND_ERROR_IS_FATAL"
  option to specify a fatal error.

* The "file(ARCHIVE_CREATE)" command gained a "COMPRESSION_LEVEL"
  option to specify the compression level.

* The "file(CHMOD)" and "file(CHMOD_RECURSE)" subcommands were added
  to set permissions of files and directories.

* The "file(DOWNLOAD)" command "" argument is now optional.  If
  it is not specified, the file is not saved.

* The "file(GENERATE)" command gained a new "TARGET" keyword to
  support resolving target-dependent generator expressions.

* The "file()" command gained a new "REAL_PATH" sub-command to compute
  a path with symlinks resolved.

* The "find_package()" command learned to handle a version range.

* The "separate_arguments()" command gained a new "PROGRAM" option. It
  allows the arguments to be treated as a program invocation and will
  resolve the executable to a full path if it can be found.

* The "DIRECTORY" option of the "set_property()", "get_property()",
  and "get_directory_property()" commands now accepts references to
  binary directory paths, such as the value of
  "CMAKE_CURRENT_BINARY_DIR".

* The "string()" command gained a set of new "JSON" sub commands that
  provide JSON parsing capabilities.

Variables
---------

* The "CMAKE_CLANG_VFS_OVERLAY" variable was added to tell Clang to
  use a VFS overlay to support the Windows SDK when cross-compiling
  from hosts with case-sensitive filesystems.

* The "CMAKE_MFC_FLAG" variable now supports generator expressions.

* The "CMAKE_OPTIMIZE_DEPENDENCIES" variable was added to initialize
  the new "OPTIMIZE_DEPENDENCIES" target property and avoid
  unnecessarily building dependencies for a static library.

* The "CMAKE_PCH_INSTANTIATE_TEMPLATES" variable was added to
  initialize the new "PCH_INSTANTIATE_TEMPLATES" target property.

* The "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM" variable was
  added to tell the Visual Studio Generators what maximum version of
  the Windows SDK to choose.

Properties
----------

* The "EXCLUDE_FROM_ALL" target property now supports "generator
  expressions".

* The "OPTIMIZE_DEPENDENCIES" target property was added to avoid
  unnecessarily building dependencies for a static library.

* The "PCH_INSTANTIATE_TEMPLATES" target property was added to enable
  template instantiation in the precompiled header. This is enabled by
  default and may significantly improve compile times. Currently only
  supported for Clang (version 11 or later).

* The "WIN32_EXECUTABLE" target property now supports "generator
  expressions".

Modules
-------

* The "CheckCompilerFlag" module has been added to generalize
  "CheckCCompilerFlag" and "CheckCXXCompilerFlag" to more languages.
  It also supports the "CUDA" and "ISPC" languages.

* The "CheckLinkerFlag" module now supports the "CUDA" language.

* The "CheckSourceCompiles" module has been added to generalize
  "CheckCSourceCompiles" and "CheckCXXSourceCompiles" to more
  languages. It also supports the "CUDA" and "ISPC" languages.

* The "CheckSourceRuns" module has been added to generalize
  "CheckCSourceRuns" and "CheckCXXSourceRuns" to more languages. It
  also supports the "CUDA" language.

* The "CMakePackageConfigHelpers" module gained support for version
  ranges.

* The "FindCUDAToolkit" module gained support for finding CUDA
  toolkits that do not contain "nvcc", as well as for finding
  scattered toolkit installations when cross-compiling.

* The "FindPackageHandleStandardArgs" module learned to handle version
  ranges. It also gained the "find_package_check_version()" command to
  check the validity of a version against version-related arguments of
  "find_package()" command.

* The "FindPython3", "FindPython2" and "FindPython" modules gained the
  ability to handle a version range.

* The "FindPython3", "FindPython2" and "FindPython" modules provide,
  respectively, the variable "Python3_LINK_OPTIONS",
  "Python2_LINK_OPTIONS" and "Python_LINK_OPTIONS" for link options.

* The "FindSDL" module now provides:

  * An imported target "SDL::SDL".

  * Result variables "SDL_LIBRARIES" and "SDL_INCLUDE_DIRS".

  * Version variables "SDL_VERSION", "SDL_VERSION_MAJOR",
    "SDL_VERSION_MINOR", and "SDL_VERSION_PATCH".

* The "FindSWIG" module gained the ability to handle a version range.

* The "FindTIFF" module gained a "CXX" component to find the "tiffxx"
  library containing C++ bindings.

* The "FindVulkan" module now provides a "Vulkan::glslc" imported
  target and associated "Vulkan_GLSLC_EXECUTABLE" variable which
  contain the path to the GLSL SPIR-V compiler.

* The "UseSWIG" module gained support for new source file properties
  "OUTPUT_DIR" and "OUTFILE_DIR" to manage output directories on a
  per-source basis.

CTest
-----

* "ctest(1)" now supports the CUDA "compute-sanitizer" checker
  (previously known as "cuda-memcheck") as the
  "CTEST_MEMORYCHECK_COMMAND". The different tools ("memcheck",
  "racecheck", "synccheck" and "initcheck") supported by "compute-
  sanitizer" can be selected by adding appropriate flags to the
  "CTEST_MEMORYCHECK_COMMAND_OPTIONS" variable.  The default flags are
  "--tool memcheck --leak-check full".

CPack
-----

* CPack gained the "CPACK_PRE_BUILD_SCRIPTS",
  "CPACK_POST_BUILD_SCRIPTS", and "CPACK_PACKAGE_FILES" variables.

* The "CPack External Generator" gained the
  "CPACK_EXTERNAL_BUILT_PACKAGES" variable.

* The "CPack WIX Generator" gained a "CPACK_WIX_CUSTOM_XMLNS" option
  to specify custom XML namespaces.

Other
-----

* Interface Libraries may now have source files added via
  "add_library()" or "target_sources()".  Those with sources will be
  generated as part of the build system.

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

* Compatibility with versions of CMake older than 2.8.12 is now
  deprecated and will be removed from a future version.  Calls to
  "cmake_minimum_required()" or "cmake_policy()" that set the policy
  version to an older value now issue a deprecation diagnostic.

* An explicit deprecation diagnostic was added for policy "CMP0071"
  ("CMP0071" and below were already deprecated). The "cmake-
  policies(7)" manual explains that the OLD behaviors of all policies
  are deprecated and that projects should port to the NEW behaviors.

* macOS SDKs older than 10.5 are no longer supported.

* "cmake-gui(1)" now requires Qt5. Support for compiling with Qt4 has
  been removed.

* The "cmake(1)" command-line option "--warn-unused-vars" has been
  removed and is now silently ignored.  The option has not worked
  correctly since CMake 3.3.

Documentation
=============

The following guides have been added:

* "IDE Integration Guide"

* "Importing and Exporting Guide"

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

* Building for macOS will now use the latest SDK available on the
  system, unless the user has explicitly chosen a SDK using
  "CMAKE_OSX_SYSROOT".  The deployment target or system macOS version
  will not affect the choice of SDK.

* The "CMAKE_<LANG>_COMPILER" variable may now be used to store
  “mandatory” compiler flags like the "CC" and other environment
  variables.

* The "CMAKE_<LANG>_FLAGS_INIT" variable will now be considered during
  the compiler identification check if other sources like
  "CMAKE_<LANG>_FLAGS" or "CFLAGS" are not set.

* The "find_program()" command now requires permission to execute but
  not to read the file found.  See policy "CMP0109".

* An imported target missing its location property fails during
  generation if the location is used.  See policy "CMP0111".

* The following target-based generator expressions that query for
  directory or file name components no longer add a dependency on the
  evaluated target. See policy "CMP0112".

  * "TARGET_FILE_DIR"

  * "TARGET_LINKER_FILE_BASE_NAME"

  * "TARGET_LINKER_FILE_NAME"

  * "TARGET_LINKER_FILE_DIR"

  * "TARGET_SONAME_FILE_NAME"

  * "TARGET_SONAME_FILE_DIR"

  * "TARGET_PDB_FILE_NAME"

  * "TARGET_PDB_FILE_DIR"

  * "TARGET_BUNDLE_DIR"

  * "TARGET_BUNDLE_CONTENT_DIR"

* Makefile Generators no longer repeat custom commands from target
  dependencies.  See policy "CMP0113".

* The "ExternalProject" module handling of step target dependencies
  has been revised.  See policy "CMP0114".

* The "OSX_ARCHITECTURES" target property is now respected for the
  "ASM" language.

* If "CUDA" compiler detection fails with user-specified
  "CMAKE_CUDA_ARCHITECTURES" or "CMAKE_CUDA_HOST_COMPILER", an error
  is raised.


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/devel/cmake/PLIST
cvs rdiff -u -r1.167 -r1.168 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/cmake/version.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/cmake-gui/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/cmake/patches/patch-Modules_FindPython_Support.cmake \
    pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/cmake/patches/patch-Utilities_std_cm_string__view
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/cmake/patches/patch-bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/Makefile
diff -u pkgsrc/devel/cmake/Makefile:1.178 pkgsrc/devel/cmake/Makefile:1.179
--- pkgsrc/devel/cmake/Makefile:1.178   Sun Nov  1 10:54:06 2020
+++ pkgsrc/devel/cmake/Makefile Wed Nov 25 10:33:28 2020
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.178 2020/11/01 10:54:06 markd Exp $
+# $NetBSD: Makefile,v 1.179 2020/11/25 10:33:28 adam Exp $
 
-PKGREVISION=           1
 .include "Makefile.common"
 
 COMMENT=       Cross platform make
@@ -13,6 +12,8 @@ CONFIGURE_SCRIPT=     bootstrap
 BUILD_TARGET=          default_target
 
 CONFIGURE_HAS_MANDIR=  no
+CONFIGURE_ARGS+=       --bootstrap-system-libuv
+CONFIGURE_ARGS+=       --bootstrap-system-librhash
 CONFIGURE_ARGS+=       --mandir=/${PKGMANDIR}
 CONFIGURE_ARGS+=       --docdir=/share/doc/cmake-${CMAKE_API}
 CONFIGURE_ARGS+=       --parallel=${MAKE_JOBS:U1}

Index: pkgsrc/devel/cmake/PLIST
diff -u pkgsrc/devel/cmake/PLIST:1.62 pkgsrc/devel/cmake/PLIST:1.63
--- pkgsrc/devel/cmake/PLIST:1.62       Fri Jul 31 09:02:31 2020
+++ pkgsrc/devel/cmake/PLIST    Wed Nov 25 10:33:28 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.62 2020/07/31 09:02:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.63 2020/11/25 10:33:28 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -184,6 +184,8 @@ share/cmake-${CMAKE_API}/Help/envvar/DES
 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/ISPC.rst
+share/cmake-${CMAKE_API}/Help/envvar/ISPCFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/LDFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/MACOSX_DEPLOYMENT_TARGET.rst
 share/cmake-${CMAKE_API}/Help/envvar/OBJC.rst
@@ -229,7 +231,6 @@ share/cmake-${CMAKE_API}/Help/manual/ID_
 share/cmake-${CMAKE_API}/Help/manual/LINKS.txt
 share/cmake-${CMAKE_API}/Help/manual/OPTIONS_BUILD.txt
 share/cmake-${CMAKE_API}/Help/manual/OPTIONS_HELP.txt
-share/cmake-${CMAKE_API}/Help/manual/VS-Choose-Arch.png
 share/cmake-${CMAKE_API}/Help/manual/ccmake.1.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-buildsystem.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-commands.7.rst
@@ -244,6 +245,7 @@ share/cmake-${CMAKE_API}/Help/manual/cma
 share/cmake-${CMAKE_API}/Help/manual/cmake-modules.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-packages.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-policies.7.rst
+share/cmake-${CMAKE_API}/Help/manual/cmake-presets.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-properties.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-qt.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cmake-server.7.rst
@@ -253,6 +255,8 @@ share/cmake-${CMAKE_API}/Help/manual/cma
 share/cmake-${CMAKE_API}/Help/manual/cpack-generators.7.rst
 share/cmake-${CMAKE_API}/Help/manual/cpack.1.rst
 share/cmake-${CMAKE_API}/Help/manual/ctest.1.rst
+share/cmake-${CMAKE_API}/Help/manual/presets/example.json
+share/cmake-${CMAKE_API}/Help/manual/presets/schema.json
 share/cmake-${CMAKE_API}/Help/module/AddFileDependencies.rst
 share/cmake-${CMAKE_API}/Help/module/AndroidTestUtilities.rst
 share/cmake-${CMAKE_API}/Help/module/BundleUtilities.rst
@@ -300,6 +304,7 @@ share/cmake-${CMAKE_API}/Help/module/Che
 share/cmake-${CMAKE_API}/Help/module/CheckCXXSourceCompiles.rst
 share/cmake-${CMAKE_API}/Help/module/CheckCXXSourceRuns.rst
 share/cmake-${CMAKE_API}/Help/module/CheckCXXSymbolExists.rst
+share/cmake-${CMAKE_API}/Help/module/CheckCompilerFlag.rst
 share/cmake-${CMAKE_API}/Help/module/CheckFortranCompilerFlag.rst
 share/cmake-${CMAKE_API}/Help/module/CheckFortranFunctionExists.rst
 share/cmake-${CMAKE_API}/Help/module/CheckFortranSourceCompiles.rst
@@ -320,6 +325,8 @@ share/cmake-${CMAKE_API}/Help/module/Che
 share/cmake-${CMAKE_API}/Help/module/CheckOBJCXXSourceRuns.rst
 share/cmake-${CMAKE_API}/Help/module/CheckPIESupported.rst
 share/cmake-${CMAKE_API}/Help/module/CheckPrototypeDefinition.rst
+share/cmake-${CMAKE_API}/Help/module/CheckSourceCompiles.rst
+share/cmake-${CMAKE_API}/Help/module/CheckSourceRuns.rst
 share/cmake-${CMAKE_API}/Help/module/CheckStructHasMember.rst
 share/cmake-${CMAKE_API}/Help/module/CheckSymbolExists.rst
 share/cmake-${CMAKE_API}/Help/module/CheckTypeSize.rst
@@ -626,6 +633,12 @@ share/cmake-${CMAKE_API}/Help/policy/CMP
 share/cmake-${CMAKE_API}/Help/policy/CMP0106.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0107.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0108.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0109.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0110.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0111.rst
+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/DEPRECATED.txt
 share/cmake-${CMAKE_API}/Help/policy/DISALLOWED_COMMAND.txt
 share/cmake-${CMAKE_API}/Help/prop_cache/ADVANCED.rst
@@ -949,6 +962,8 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/I
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IOS_INSTALL_COMBINED.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ISPC_HEADER_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ISPC_INSTRUCTION_SETS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/JOB_POOL_COMPILE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/JOB_POOL_LINK.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/JOB_POOL_PRECOMPILE_HEADER.rst
@@ -1000,10 +1015,12 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/O
 share/cmake-${CMAKE_API}/Help/prop_tgt/OBJC_EXTENSIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/OBJC_STANDARD.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/OBJC_STANDARD_REQUIRED.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/OPTIMIZE_DEPENDENCIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/OSX_ARCHITECTURES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/OSX_ARCHITECTURES_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/OUTPUT_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/OUTPUT_NAME_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/PCH_INSTANTIATE_TEMPLATES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/PCH_WARN_INVALID.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/PDB_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/PDB_NAME_CONFIG.rst
@@ -1090,6 +1107,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/W
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.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
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_PRODUCT_TYPE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_ADDRESS_SANITIZER.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN.rst
@@ -1126,6 +1144,7 @@ share/cmake-${CMAKE_API}/Help/release/3.
 share/cmake-${CMAKE_API}/Help/release/3.16.rst
 share/cmake-${CMAKE_API}/Help/release/3.17.rst
 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.3.rst
 share/cmake-${CMAKE_API}/Help/release/3.4.rst
@@ -1202,6 +1221,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CACHE_MINOR_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CACHE_PATCH_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CFG_INTDIR.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_CLANG_VFS_OVERLAY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CL_64.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CODEBLOCKS_COMPILER_ID.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.rst
@@ -1358,6 +1378,8 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ISPC_HEADER_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ISPC_INSTRUCTION_SETS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOLS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOL_LINK.rst
@@ -1475,12 +1497,14 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_OBJC_STANDARD.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_OBJC_STANDARD_REQUIRED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_OBJECT_PATH_MAX.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_OPTIMIZE_DEPENDENCIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_OSX_ARCHITECTURES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_OSX_DEPLOYMENT_TARGET.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_OSX_SYSROOT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_OSX_VARIABLE.txt
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PARENT_LIST_FILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PATCH_VERSION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_PCH_INSTANTIATE_TEMPLATES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PCH_WARN_INVALID.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PDB_OUTPUT_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
@@ -1585,14 +1609,17 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_SDK_REFERENCE_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_SDK_SOURCE_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_WINRT_BY_DEFAULT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WARN_DEPRECATED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WIN32_EXECUTABLE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_BUILD_SYSTEM.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_LINK_BUILD_PHASE_MODE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN.rst
@@ -1799,6 +1826,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeDe
 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/CMakeDetermineISPCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineJavaCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineOBJCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineOBJCXXCompiler.cmake
@@ -1828,6 +1856,10 @@ share/cmake-${CMAKE_API}/Modules/CMakeFo
 share/cmake-${CMAKE_API}/Modules/CMakeGenericSystem.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeGraphVizOptions.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeIOSInstallCombined.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeISPCCompiler.cmake.in
+share/cmake-${CMAKE_API}/Modules/CMakeISPCCompilerABI.ispc
+share/cmake-${CMAKE_API}/Modules/CMakeISPCCompilerId.ispc.in
+share/cmake-${CMAKE_API}/Modules/CMakeISPCInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeImportBuildSettings.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeInitializeConfigs.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeJOMFindMake.cmake
@@ -1872,6 +1904,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeTe
 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/CMakeTestISPCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestJavaCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestOBJCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestOBJCXXCompiler.cmake
@@ -1896,6 +1929,7 @@ share/cmake-${CMAKE_API}/Modules/CheckCX
 share/cmake-${CMAKE_API}/Modules/CheckCXXSourceCompiles.cmake
 share/cmake-${CMAKE_API}/Modules/CheckCXXSourceRuns.cmake
 share/cmake-${CMAKE_API}/Modules/CheckCXXSymbolExists.cmake
+share/cmake-${CMAKE_API}/Modules/CheckCompilerFlag.cmake
 share/cmake-${CMAKE_API}/Modules/CheckForPthreads.c
 share/cmake-${CMAKE_API}/Modules/CheckFortranCompilerFlag.cmake
 share/cmake-${CMAKE_API}/Modules/CheckFortranFunctionExists.cmake
@@ -1932,6 +1966,8 @@ share/cmake-${CMAKE_API}/Modules/CheckPI
 share/cmake-${CMAKE_API}/Modules/CheckPrototypeDefinition.c.in
 share/cmake-${CMAKE_API}/Modules/CheckPrototypeDefinition.cmake
 share/cmake-${CMAKE_API}/Modules/CheckSizeOf.cmake
+share/cmake-${CMAKE_API}/Modules/CheckSourceCompiles.cmake
+share/cmake-${CMAKE_API}/Modules/CheckSourceRuns.cmake
 share/cmake-${CMAKE_API}/Modules/CheckStructHasMember.cmake
 share/cmake-${CMAKE_API}/Modules/CheckSymbolExists.cmake
 share/cmake-${CMAKE_API}/Modules/CheckTypeSize.c.in
@@ -2033,7 +2069,10 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel-DetermineCompiler.cmake
 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/IntelClang-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/IntelDPCPP-DetermineCompiler.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
@@ -2081,6 +2120,7 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/TI-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/TI-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/TI-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/TI.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/TinyCC-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake
@@ -2355,6 +2395,9 @@ share/cmake-${CMAKE_API}/Modules/Interna
 share/cmake-${CMAKE_API}/Modules/Internal/CPack/NSIS.InstallOptions.ini.in
 share/cmake-${CMAKE_API}/Modules/Internal/CPack/NSIS.template.in
 share/cmake-${CMAKE_API}/Modules/Internal/CPack/WIX.template.in
+share/cmake-${CMAKE_API}/Modules/Internal/CheckCompilerFlag.cmake
+share/cmake-${CMAKE_API}/Modules/Internal/CheckSourceCompiles.cmake
+share/cmake-${CMAKE_API}/Modules/Internal/CheckSourceRuns.cmake
 share/cmake-${CMAKE_API}/Modules/Internal/FeatureTesting.cmake
 share/cmake-${CMAKE_API}/Modules/KDE3Macros.cmake
 share/cmake-${CMAKE_API}/Modules/MacOSXBundleInfo.plist.in
@@ -2399,6 +2442,7 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/Android/Determine-Compiler-NDK.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Android/Determine-Compiler-Standalone.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Android/Determine-Compiler.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Android/VCXProjInspect.vcxproj.in
 share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Android/abi-armeabi-Clang.cmake
@@ -2635,6 +2679,7 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Intel-CXX.cmake
 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-MSVC-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-MSVC-CXX.cmake

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.167 pkgsrc/devel/cmake/distinfo:1.168
--- pkgsrc/devel/cmake/distinfo:1.167   Sun Nov  1 10:54:06 2020
+++ pkgsrc/devel/cmake/distinfo Wed Nov 25 10:33:28 2020
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.167 2020/11/01 10:54:06 markd Exp $
+$NetBSD: distinfo,v 1.168 2020/11/25 10:33:28 adam Exp $
 
-SHA1 (cmake-3.18.4.tar.gz) = 73ab5348c881f1a53c250b66848b6ee101c9fe1f
-RMD160 (cmake-3.18.4.tar.gz) = 1515424e50f418ad80c395c98a45ac3a7229b878
-SHA512 (cmake-3.18.4.tar.gz) = 2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9
-Size (cmake-3.18.4.tar.gz) = 8976659 bytes
+SHA1 (cmake-3.19.1.tar.gz) = 0aec103faa6042683a42412e0f9c359c69208e2d
+RMD160 (cmake-3.19.1.tar.gz) = 24c204773d53fa1e21403070f8b86c885d9cbda4
+SHA512 (cmake-3.19.1.tar.gz) = 1a1c9a8546c80f8602babffc7fd398cea5d9163512ef74333f87e26a97ca35358bd0e90423768cfc971ebfed185e19d775737e557e0e982403b77a2ccbcd063a
+Size (cmake-3.19.1.tar.gz) = 9256956 bytes
 SHA1 (patch-CMakeLists.txt) = fabdb0590f4b97c34c2242749ae3b6af18aefc0a
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
 SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0
 SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
 SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
-SHA1 (patch-Modules_FindPython_Support.cmake) = df41583388a6dd3654e682cc4317b48433d9d552
+SHA1 (patch-Modules_FindPython_Support.cmake) = 24ac481659fa3d5306e0e00b05c2be083a2a9906
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
 SHA1 (patch-Modules_Platform_Darwin.cmake) = 11116f5b1d1e68a1ce9f76c854d3078e8e233b7a
 SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c
@@ -18,8 +18,5 @@ SHA1 (patch-Source_CMakeLists.txt) = 533
 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_CursesDialog_ccmake.cxx) = 7f6ca6fda5d0db615f04c18efa8ecdd6ef00cb93
-SHA1 (patch-Source_QtDialog_CMakeLists.txt) = c4007da363c5b7c925f1ff345901057f3fbdc4e1
+SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 663880c10a923090839eda84fabe4da229020a26
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
-SHA1 (patch-Utilities_std_cm_string__view) = 90bbb578c5628b661a25974d7dd9aa6f5063271f
-SHA1 (patch-bootstrap) = fc1b689bbe705cd888e2bef4debad1a26e5885bd

Index: pkgsrc/devel/cmake/version.mk
diff -u pkgsrc/devel/cmake/version.mk:1.4 pkgsrc/devel/cmake/version.mk:1.5
--- pkgsrc/devel/cmake/version.mk:1.4   Thu Oct  8 10:57:46 2020
+++ pkgsrc/devel/cmake/version.mk       Wed Nov 25 10:33:28 2020
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.4 2020/10/08 10:57:46 adam Exp $
+# $NetBSD: version.mk,v 1.5 2020/11/25 10:33:28 adam Exp $
 # used by devel/cmake/Makefile.common
 # used by devel/cmake-fedora/Makefile
 
-CMAKE_VERSION= 3.18.4
+CMAKE_VERSION= 3.19.1
 CMAKE_API=     ${CMAKE_VERSION:R}

Index: pkgsrc/devel/cmake-gui/Makefile
diff -u pkgsrc/devel/cmake-gui/Makefile:1.17 pkgsrc/devel/cmake-gui/Makefile:1.18
--- pkgsrc/devel/cmake-gui/Makefile:1.17        Thu Nov  5 09:07:52 2020
+++ pkgsrc/devel/cmake-gui/Makefile     Wed Nov 25 10:33:28 2020
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.17 2020/11/05 09:07:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.18 2020/11/25 10:33:28 adam Exp $
 
-PKGREVISION= 1
 .include "../../devel/cmake/Makefile.common"
 
 PKGNAME=       cmake-gui-${CMAKE_VERSION}

Index: pkgsrc/devel/cmake/patches/patch-Modules_FindPython_Support.cmake
diff -u pkgsrc/devel/cmake/patches/patch-Modules_FindPython_Support.cmake:1.1 pkgsrc/devel/cmake/patches/patch-Modules_FindPython_Support.cmake:1.2
--- pkgsrc/devel/cmake/patches/patch-Modules_FindPython_Support.cmake:1.1       Sun Nov  1 10:54:06 2020
+++ pkgsrc/devel/cmake/patches/patch-Modules_FindPython_Support.cmake   Wed Nov 25 10:33:28 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-Modules_FindPython_Support.cmake,v 1.1 2020/11/01 10:54:06 markd Exp $
+$NetBSD: patch-Modules_FindPython_Support.cmake,v 1.2 2020/11/25 10:33:28 adam Exp $
 
-Insist on select python version for pkgsrc.
+Insist on select Python version for pkgsrc.
 
---- Modules/FindPython/Support.cmake.orig      2020-10-06 12:28:17.000000000 +0000
+--- Modules/FindPython/Support.cmake.orig      2020-11-24 13:50:26.000000000 +0000
 +++ Modules/FindPython/Support.cmake
 @@ -21,7 +21,9 @@ endif()
  if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
@@ -12,6 +12,6 @@ Insist on select python version for pkgs
 +if (DEFINED PYVERSSUFFIX)
 +  set(_${_PYTHON_PREFIX}_VERSIONS ${PYVERSSUFFIX})
 +elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
-   set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+   set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
  elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2")
    set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
Index: pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt
diff -u pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt:1.1 pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt:1.2
--- pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt:1.1 Wed Nov 27 22:32:27 2019
+++ pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt     Wed Nov 25 10:33:28 2020
@@ -1,28 +1,26 @@
-$NetBSD: patch-Source_QtDialog_CMakeLists.txt,v 1.1 2019/11/27 22:32:27 adam Exp $
+$NetBSD: patch-Source_QtDialog_CMakeLists.txt,v 1.2 2020/11/25 10:33:28 adam Exp $
 
 Do not make app bundle on Darwin.
 
---- Source/QtDialog/CMakeLists.txt.orig        2019-11-26 14:18:07.000000000 +0000
+--- Source/QtDialog/CMakeLists.txt.orig        2020-11-24 13:50:26.000000000 +0000
 +++ Source/QtDialog/CMakeLists.txt
-@@ -154,7 +154,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} 
+@@ -158,13 +158,13 @@ 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)
+ 
  if(WIN32)
-   set(SRCS ${SRCS} CMakeSetup.rc)
+   target_sources(CMakeGUIMainLib INTERFACE $<TARGET_OBJECTS:CMakeVersion> CMakeSetup.rc)
  endif()
 -if(APPLE)
 +if(FALSE)
-   set(SRCS ${SRCS} CMakeSetup.icns)
+   target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.icns)
    set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
    set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -171,7 +171,7 @@ endif()
- 
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- 
--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
-+add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
- target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
- 
- if(WIN32)
-@@ -197,7 +197,7 @@ Checks: '-*,llvm-twine-local'
+@@ -194,7 +194,7 @@ Checks: '-*,llvm-twine-local'
  ...
  ")
  
@@ -31,7 +29,7 @@ Do not make app bundle on Darwin.
    file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
      LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
  
-@@ -224,7 +224,7 @@ install(TARGETS cmake-gui
+@@ -221,7 +221,7 @@ install(TARGETS cmake-gui
    RUNTIME DESTINATION bin ${COMPONENT}
    ${CMAKE_INSTALL_DESTINATION_ARGS})
  
@@ -40,7 +38,7 @@ Do not make app bundle on Darwin.
    foreach (size IN ITEMS 32 128)
      install(
        FILES       "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png"
-@@ -243,14 +243,14 @@ if(UNIX AND NOT APPLE)
+@@ -240,14 +240,14 @@ if(UNIX AND NOT APPLE)
      ${COMPONENT})
  endif()