CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 27 Nov 2019 22:32:27 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Nov 27 22:32:27 UTC 2019

Modified Files:
        pkgsrc/devel: Makefile
        pkgsrc/devel/cmake: Makefile Makefile.version PLIST distinfo
        pkgsrc/devel/cmake/patches: patch-CMakeLists.txt
            patch-Modules_FindCurses.cmake
            patch-Source_Checks_cm__cxx17__check.cpp
            patch-Source_CursesDialog_ccmake.cxx
            patch-Source_cmArchiveWrite.cxx patch-bootstrap
Added Files:
        pkgsrc/devel/cmake-gui: DESCR Makefile PLIST
        pkgsrc/devel/cmake/patches: patch-Source_QtDialog_CMakeLists.txt
            patch-Utilities_std_cm_string__view
Removed Files:
        pkgsrc/devel/cmake/patches: patch-Source_Checks_cm_cxx_features.cmake
            patch-Source_cm__string__view.hxx

Log Message:
cmake: updated to 3.16.0

3.16.0:

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

Languages
---------

* CMake learned to support the Objective C ("OBJC") and Objective
  C++ ("OBJCXX") languages.  They may be enabled via the "project()"
  and "enable_language()" commands.  When "OBJC" or "OBJCXX" is
  enabled, source files with the ".m" or ".mm", respectively, will be
  compiled as Objective C or C++.  Otherwise they will be treated as
  plain C++ sources as they were before.

Compilers
---------

* The "Clang" compiler is now supported on "Solaris".

Platforms
---------

* On AIX, executables using the "ENABLE_EXPORTS" target property now
  produce a linker import file with a ".imp" extension in addition to
  the executable file.  Plugins (created via "add_library()" with the
  "MODULE" option) that use "target_link_libraries()" to link to the
  executable for its symbols are now linked using the import file. The
  "install(TARGETS)" command now installs the import file as an
  "ARCHIVE" artifact.

* On AIX, runtime linking is no longer enabled by default.  CMake
  provides the linker enough information to resolve all symbols up
  front. One may manually enable runtime linking for shared libraries
  and/or loadable modules by adding "-Wl,-G" to their link flags (e.g.
  in the "CMAKE_SHARED_LINKER_FLAGS" or "CMAKE_MODULE_LINKER_FLAGS"
  variable). One may manually enable runtime linking for executables
  by adding "-Wl,-brtl" to their link flags (e.g. in the
  "CMAKE_EXE_LINKER_FLAGS" variable).

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

* "cmake(1)" "-E" now supports "true" and "false" commands, which do
  nothing while returning exit codes of 0 and 1, respectively.

* "cmake(1)" gained a "--trace-redirect=" command line option
  that can be used to redirect "--trace" output to a file instead of
  "stderr".

* The "cmake(1)" "--loglevel" command line option has been renamed
  to "--log-level" to make it consistent with the naming of other
  command line options.  The "--loglevel" option is still supported to
  preserve backward compatibility.

Commands
--------

* The "add_test()" command learned the option "COMMAND_EXPAND_LISTS"
  which causes lists in the "COMMAND" argument to be expanded,
  including lists created by generator expressions.

* The "file()" command learned a new sub-command,
  "GET_RUNTIME_DEPENDENCIES", which allows you to recursively get the
  list of libraries linked by an executable or library. This sub-
  command is intended as a replacement for "GetPrerequisites".

* The "find_file()", "find_library()", "find_path()",
  "find_package()", and "find_program()" commands have learned to
  check the following variables to control searching

  * "CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH" - Controls the searching
    the cmake-specific environment variables.

  * "CMAKE_FIND_USE_CMAKE_PATH" - Controls the searching the cmake-
    specific cache variables.

  * "CMAKE_FIND_USE_CMAKE_SYSTEM_PATH" - Controls the searching
    cmake platform specific variables.

  * "CMAKE_FIND_USE_PACKAGE_ROOT_PATH" - Controls the searching of
    "_ROOT" variables.

  * "CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH" - Controls the
    searching the standard system environment variables.

* The "find_package()" command has learned to check the following
  variables to control searching

  * "CMAKE_FIND_USE_PACKAGE_REGISTRY" - Controls the searching the
    cmake user registry.

* The "message()" command learned indentation control with the new
  "CMAKE_MESSAGE_INDENT" variable.

* The "target_precompile_headers()" command was added to specify a
  list of headers to precompile for faster compilation times.

Variables
---------

* The "CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS" variable has been
  introduced to optionally initialize the
  "CUDA_RESOLVE_DEVICE_SYMBOLS" target property.

* The "CMAKE_ECLIPSE_RESOURCE_ENCODING" variable was added to
  specify the resource encoding for the the "Eclipse CDT4" extra
  generator.

Properties
----------

* The "BUILD_RPATH" and "INSTALL_RPATH" target properties now
  support "generator expressions".

* The "INSTALL_REMOVE_ENVIRONMENT_RPATH" target property was added
  to remove compiler-defined "RPATH" entries from a target. This
  property is initialized by the
  "CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH" variable.

* The "PRECOMPILE_HEADERS" target property was added to specify a
  list of headers to precompile for faster compilation times. Set it
  using the "target_precompile_headers()" command.

* The "UNITY_BUILD" target property was added to tell generators to
  batch include source files for faster compilation times.

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

* The "VS_DPI_AWARE" target property was added to tell Visual Studio
  Generators to set the "EnableDpiAwareness" property in ".vcxproj"
  files.

* The "XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING" target property was
  added to tell the "Xcode" generator to set the value of the "Allow
  debugging when using document Versions Browser" schema option.

Modules
-------

* The "FindDoxygen" module "doxygen_add_docs()" command gained a new
  "USE_STAMP_FILE" option.  When this option present, the custom
  target created by the command will only re-run Doxygen if any of the
  source files have changed since the last successful run.

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

* The "FindPackageHandleStandardArgs" module
  "find_package_handle_standard_args()" command gained a new
  "REASON_FAILURE_MESSAGE" option to specify a message giving the
  reason for the failure.

* The "FindPkgConfig" module "pkg_search_module()" macro now defines
  a "_MODULE_NAME" result variable containing the first
  matching module name.

* The "FindPython3" and "FindPython" modules gained options to
  control which "ABIs" will be searched.

* The "FindPython3", "FindPython2", and "FindPython" modules now
  support direct specification of artifacts via cache entries.

Autogen
-------

* When using "AUTOMOC", CMake now generates the "-p" path prefix
  option for "moc".  This ensures that "moc" output files are
  identical on different build setups (given, that the headers
  compiled by "moc" are in an "include directory"). Also it ensures
  that "moc" output files will compile correctly when the source
  and/or build directory is a symbolic link.

  The "moc" path prefix generation behavior can be configured by
  setting the new "CMAKE_AUTOMOC_PATH_PREFIX" variable and/or
  "AUTOMOC_PATH_PREFIX" target property.

CTest
-----

* "ctest(1)" now has the ability to serialize tests based on
  resource requirements for each test. See Resource Allocation for
  details.

* A new test property, "SKIP_REGULAR_EXPRESSION", has been added.
  This property is similar to "FAIL_REGULAR_EXPRESSION" and
  "PASS_REGULAR_EXPRESSION", but with the same meaning as
  "SKIP_RETURN_CODE". This is useful, for example, in cases where the
  user has no control over the return code of the test. For example,
  in Catch2, the return value is the number of assertion failed,
  therefore it is impossible to use it for "SKIP_RETURN_CODE".

CPack
-----

* "cpack(1)" learned support for multiple configurations for "-C"
 option.

* The "CPack DEB Generator" is now able to format generic text
  (usually used as the description for multiple CPack generators)
  according to the Debian Policy Manual.  See the
  "CPACK_PACKAGE_DESCRIPTION_FILE" and
  "CPACK_DEBIAN__DESCRIPTION" variables.

* The "CPack Archive Generator" learned to generate ".tar.zst"
  packages with Zstandard compression.

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

* An explicit deprecation diagnostic was added for policy "CMP0067"
  ("CMP0066" 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.

* The "CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY" variable has been
  deprecated.  Use the "CMAKE_FIND_USE_PACKAGE_REGISTRY" variable
  instead.

* The "GetPrerequisites" module has been deprecated, as it has been
  superceded by "file(GET_RUNTIME_DEPENDENCIES)".

* The "CPACK_INSTALL_SCRIPT" variable has been deprecated in favor
  of the new, more accurately named "CPACK_INSTALL_SCRIPTS" variable.

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

* The "cmake(1)" "-C " option now evaluates the
  initial cache script with "CMAKE_SOURCE_DIR" and "CMAKE_BINARY_DIR"
  set to the top-level source and build trees.

* The "cmake(1)" "-E remove_directory" command-line tool, when given
  the path to a symlink to a directory, now removes just the symlink.
  It no longer removes content of the linked directory.

* The "ctest(1)"  "--build-makeprogram" command-line option now
  specifies the make program used when configuring a project with the
  "Ninja" generator or the Makefile Generators.

* The "ExternalProject" module "ExternalProject_Add()" command has
  been updated so that "GIT_SUBMODULES """ initializes no submodules.
  See policy "CMP0097".

* The "FindGTest" module has been updated to recognize MSVC build
  trees generated by GTest 1.8.1.

* The "project()" command no longer strips leading zeros in version
  components.  See policy "CMP0096".

* The Qt Compressed Help file is now named "CMake.qch", which no
  longer contains the release version in the file name.  When CMake is
  upgraded in-place, the name and location of this file will remain
  constant. Tools such as IDEs, help viewers, etc. should now be able
  to refer to this file at a fixed location that remains valid across
  CMake upgrades.

* "RPATH" entries are properly escaped in the generated CMake
  scripts used for installation.  See policy "CMP0095".

* When using "CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS" on Windows the auto-
  generated exports are now updated only when the object files
  providing the symbols are updated.


To generate a diff of this commit:
cvs rdiff -u -r1.2959 -r1.2960 pkgsrc/devel/Makefile
cvs rdiff -u -r1.167 -r1.168 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/cmake/Makefile.version
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/cmake/PLIST
cvs rdiff -u -r1.148 -r1.149 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/cmake-gui/DESCR \
    pkgsrc/devel/cmake-gui/Makefile pkgsrc/devel/cmake-gui/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/cmake/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake \
    pkgsrc/devel/cmake/patches/patch-bootstrap
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/cmake/patches/patch-Source_Checks_cm__cxx17__check.cpp
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/devel/cmake/patches/patch-Source_Checks_cm_cxx_features.cmake
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt \
    pkgsrc/devel/cmake/patches/patch-Utilities_std_cm_string__view
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/cmake/patches/patch-Source_cm__string__view.hxx

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

Modified files:

Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.2959 pkgsrc/devel/Makefile:1.2960
--- pkgsrc/devel/Makefile:1.2959        Wed Nov 27 21:25:20 2019
+++ pkgsrc/devel/Makefile       Wed Nov 27 22:32:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2959 2019/11/27 21:25:20 markd Exp $
+# $NetBSD: Makefile,v 1.2960 2019/11/27 22:32:27 adam Exp $
 #
 
 COMMENT=       Development utilities
@@ -186,6 +186,7 @@ SUBDIR+=    clisp-zlib
 SUBDIR+=       cloc
 SUBDIR+=       cmake
 SUBDIR+=       cmake-fedora
+SUBDIR+=       cmake-gui
 SUBDIR+=       cmake-mode
 SUBDIR+=       cmocka
 SUBDIR+=       cmockery2

Index: pkgsrc/devel/cmake/Makefile
diff -u pkgsrc/devel/cmake/Makefile:1.167 pkgsrc/devel/cmake/Makefile:1.168
--- pkgsrc/devel/cmake/Makefile:1.167   Thu Sep  5 08:39:09 2019
+++ pkgsrc/devel/cmake/Makefile Wed Nov 27 22:32:27 2019
@@ -1,18 +1,10 @@
-# $NetBSD: Makefile,v 1.167 2019/09/05 08:39:09 adam Exp $
+# $NetBSD: Makefile,v 1.168 2019/11/27 22:32:27 adam Exp $
 
-.include "Makefile.version"
+.include "Makefile.common"
 
-DISTNAME=      cmake-${CMAKE_VERSION}
-CATEGORIES=    devel
-MASTER_SITES=  https://cmake.org/files/v${CMAKE_API}/
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.cmake.org/
 COMMENT=       Cross platform make
-LICENSE=       modified-bsd
 
 USE_TOOLS+=            gmake
-USE_LANGUAGES=         c c++11
 GCC_REQD+=             4.8
 HAS_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      bootstrap

Index: pkgsrc/devel/cmake/Makefile.version
diff -u pkgsrc/devel/cmake/Makefile.version:1.48 pkgsrc/devel/cmake/Makefile.version:1.49
--- pkgsrc/devel/cmake/Makefile.version:1.48    Thu Oct 31 13:30:31 2019
+++ pkgsrc/devel/cmake/Makefile.version Wed Nov 27 22:32:27 2019
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.version,v 1.48 2019/10/31 13:30:31 adam Exp $
-#
-# used by devel/cmake/Makefile
+# $NetBSD: Makefile.version,v 1.49 2019/11/27 22:32:27 adam Exp $
+# used by devel/cmake/Makefile.common
 # used by devel/cmake-fedora/Makefile
-CMAKE_VERSION= 3.15.5
+CMAKE_VERSION= 3.16.0
 CMAKE_API=     ${CMAKE_VERSION:R}

Index: pkgsrc/devel/cmake/PLIST
diff -u pkgsrc/devel/cmake/PLIST:1.58 pkgsrc/devel/cmake/PLIST:1.59
--- pkgsrc/devel/cmake/PLIST:1.58       Thu Oct 31 13:30:31 2019
+++ pkgsrc/devel/cmake/PLIST    Wed Nov 27 22:32:27 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.58 2019/10/31 13:30:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.59 2019/11/27 22:32:27 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -121,6 +121,7 @@ share/cmake-${CMAKE_API}/Help/command/ta
 share/cmake-${CMAKE_API}/Help/command/target_link_directories.rst
 share/cmake-${CMAKE_API}/Help/command/target_link_libraries.rst
 share/cmake-${CMAKE_API}/Help/command/target_link_options.rst
+share/cmake-${CMAKE_API}/Help/command/target_precompile_headers.rst
 share/cmake-${CMAKE_API}/Help/command/target_sources.rst
 share/cmake-${CMAKE_API}/Help/command/try_compile.rst
 share/cmake-${CMAKE_API}/Help/command/try_run.rst
@@ -296,6 +297,12 @@ share/cmake-${CMAKE_API}/Help/module/Che
 share/cmake-${CMAKE_API}/Help/module/CheckIncludeFiles.rst
 share/cmake-${CMAKE_API}/Help/module/CheckLanguage.rst
 share/cmake-${CMAKE_API}/Help/module/CheckLibraryExists.rst
+share/cmake-${CMAKE_API}/Help/module/CheckOBJCCompilerFlag.rst
+share/cmake-${CMAKE_API}/Help/module/CheckOBJCSourceCompiles.rst
+share/cmake-${CMAKE_API}/Help/module/CheckOBJCSourceRuns.rst
+share/cmake-${CMAKE_API}/Help/module/CheckOBJCXXCompilerFlag.rst
+share/cmake-${CMAKE_API}/Help/module/CheckOBJCXXSourceCompiles.rst
+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/CheckStructHasMember.rst
@@ -589,6 +596,9 @@ share/cmake-${CMAKE_API}/Help/policy/CMP
 share/cmake-${CMAKE_API}/Help/policy/CMP0092.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0093.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0094.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0095.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0096.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0097.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
@@ -698,6 +708,8 @@ share/cmake-${CMAKE_API}/Help/prop_sf/SK
 share/cmake-${CMAKE_API}/Help/prop_sf/SKIP_AUTOMOC.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/SKIP_AUTORCC.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/SKIP_AUTOUIC.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/SKIP_PRECOMPILE_HEADERS.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/SKIP_UNITY_BUILD_INCLUSION.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/SYMBOLIC.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/Swift_DEPENDENCIES_FILE.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/Swift_DIAGNOSTICS_FILE.rst
@@ -738,8 +750,10 @@ share/cmake-${CMAKE_API}/Help/prop_test/
 share/cmake-${CMAKE_API}/Help/prop_test/PROCESSORS.rst
 share/cmake-${CMAKE_API}/Help/prop_test/PROCESSOR_AFFINITY.rst
 share/cmake-${CMAKE_API}/Help/prop_test/REQUIRED_FILES.rst
+share/cmake-${CMAKE_API}/Help/prop_test/RESOURCE_GROUPS.rst
 share/cmake-${CMAKE_API}/Help/prop_test/RESOURCE_LOCK.rst
 share/cmake-${CMAKE_API}/Help/prop_test/RUN_SERIAL.rst
+share/cmake-${CMAKE_API}/Help/prop_test/SKIP_REGULAR_EXPRESSION.rst
 share/cmake-${CMAKE_API}/Help/prop_test/SKIP_RETURN_CODE.rst
 share/cmake-${CMAKE_API}/Help/prop_test/TIMEOUT.rst
 share/cmake-${CMAKE_API}/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
@@ -778,6 +792,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/A
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOMOC_EXECUTABLE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOMOC_MACRO_NAMES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOMOC_MOC_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTORCC.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTORCC_EXECUTABLE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTORCC_OPTIONS.rst
@@ -826,6 +841,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/D
 share/cmake-${CMAKE_API}/Help/prop_tgt/DEFINE_SYMBOL.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/DEPLOYMENT_ADDITIONAL_FILES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/DISABLE_PRECOMPILE_HEADERS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ENABLE_EXPORTS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXCLUDE_FROM_ALL.rst
@@ -873,6 +889,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/I
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORT_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INCLUDE_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INSTALL_NAME_DIR.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/INSTALL_REMOVE_ENVIRONMENT_RPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INSTALL_RPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INSTALL_RPATH_USE_LINK_PATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
@@ -886,6 +903,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/I
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_LINK_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_POSITION_INDEPENDENT_CODE.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_PRECOMPILE_HEADERS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_SOURCES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst
@@ -933,6 +951,12 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/M
 share/cmake-${CMAKE_API}/Help/prop_tgt/NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/NO_SONAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/NO_SYSTEM_FROM_IMPORTED.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/OBJCXX_EXTENSIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/OBJCXX_STANDARD.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/OBJCXX_STANDARD_REQUIRED.rst
+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/OSX_ARCHITECTURES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/OSX_ARCHITECTURES_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/OUTPUT_NAME.rst
@@ -944,6 +968,8 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/P
 share/cmake-${CMAKE_API}/Help/prop_tgt/PDB_OUTPUT_DIRECTORY_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/POSITION_INDEPENDENT_CODE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/POST_INSTALL_SCRIPT.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/PRECOMPILE_HEADERS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/PREFIX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/PRE_INSTALL_SCRIPT.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/PRIVATE_HEADER.rst
@@ -966,9 +992,14 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/S
 share/cmake-${CMAKE_API}/Help/prop_tgt/STATIC_LIBRARY_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/Swift_DEPENDENCIES_FILE.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/Swift_LANGUAGE_VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/Swift_MODULE_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/Swift_MODULE_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/TYPE.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/UNITY_BUILD.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst
+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/VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
@@ -982,6 +1013,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/V
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DOTNET_REFERENCES_COPY_LOCAL.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DOTNET_REFERENCE_refname.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DPI_AWARE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_GLOBAL_PROJECT_TYPES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_GLOBAL_ROOTNAMESPACE.rst
@@ -1014,6 +1046,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/X
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_ARGUMENTS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_DEBUG_AS_ROOT.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
@@ -1040,6 +1073,7 @@ share/cmake-${CMAKE_API}/Help/release/3.
 share/cmake-${CMAKE_API}/Help/release/3.12.rst
 share/cmake-${CMAKE_API}/Help/release/3.13.rst
 share/cmake-${CMAKE_API}/Help/release/3.14.rst
+share/cmake-${CMAKE_API}/Help/release/3.15.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
@@ -1095,6 +1129,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC_MACRO_NAMES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC_MOC_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC_RELAXED_MODE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTORCC.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTORCC_OPTIONS.rst
@@ -1134,6 +1169,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CTEST_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_EXTENSIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_HOST_COMPILER.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_STANDARD.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_STANDARD_REQUIRED.rst
@@ -1156,11 +1192,13 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.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
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DL_LIBS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_RESOURCE_ENCODING.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EDIT_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ENABLE_EXPORTS.rst
@@ -1197,6 +1235,13 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_PACKAGE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_XXX.txt
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_USE_CMAKE_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_USE_CMAKE_SYSTEM_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_USE_PACKAGE_REGISTRY.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_USE_PACKAGE_ROOT_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FOLDER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FRAMEWORK.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FRAMEWORK_PATH.rst
@@ -1238,6 +1283,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_NAME_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_RPATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
@@ -1297,6 +1343,9 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_LINKER_WRAPPER_FLAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_LINKER_WRAPPER_FLAG_SEP.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_LINK_EXECUTABLE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_LINK_LIBRARY_FILE_FLAG.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_LINK_LIBRARY_FLAG.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_LINK_LIBRARY_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_OUTPUT_EXTENSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_PLATFORM_ID.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_SIMULATE_ID.rst
@@ -1330,6 +1379,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MATCH_COUNT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MATCH_n.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MAXIMUM_RECURSION_DEPTH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_MESSAGE_INDENT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MFC_FLAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MINIMUM_REQUIRED_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MINOR_VERSION.rst
@@ -1346,6 +1396,12 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_NO_SYSTEM_FROM_IMPORTED.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_OBJCXX_EXTENSIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_OBJCXX_STANDARD.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_OBJCXX_STANDARD_REQUIRED.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_OBJC_EXTENSIONS.rst
+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_OSX_ARCHITECTURES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_OSX_DEPLOYMENT_TARGET.rst
@@ -1424,6 +1480,8 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst
 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_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
@@ -1442,6 +1500,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_NAME_DEFAULT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA_CUSTOM_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_SDK_EXCLUDE_DIRECTORIES.rst
@@ -1463,6 +1522,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 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
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_DEBUG_DOCUMENT_VERSIONING.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE.rst
@@ -1481,7 +1541,6 @@ share/cmake-${CMAKE_API}/Help/variable/C
 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
-share/cmake-${CMAKE_API}/Help/variable/CPACK_INSTALL_SCRIPT.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_PACKAGING_INSTALL_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_SET_DESTDIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst
@@ -1664,6 +1723,8 @@ share/cmake-${CMAKE_API}/Modules/CMakeDe
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerId.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineFortranCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineJavaCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeDetermineOBJCCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeDetermineOBJCXXCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineRCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineSwiftCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineSystem.cmake
@@ -1700,6 +1761,14 @@ share/cmake-${CMAKE_API}/Modules/CMakeMS
 share/cmake-${CMAKE_API}/Modules/CMakeMinGWFindMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeNMakeFindMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeNinjaFindMake.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeOBJCCompiler.cmake.in
+share/cmake-${CMAKE_API}/Modules/CMakeOBJCCompilerABI.m
+share/cmake-${CMAKE_API}/Modules/CMakeOBJCCompilerId.m.in
+share/cmake-${CMAKE_API}/Modules/CMakeOBJCInformation.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeOBJCXXCompiler.cmake.in
+share/cmake-${CMAKE_API}/Modules/CMakeOBJCXXCompilerABI.mm
+share/cmake-${CMAKE_API}/Modules/CMakeOBJCXXCompilerId.mm.in
+share/cmake-${CMAKE_API}/Modules/CMakeOBJCXXInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakePackageConfigHelpers.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeParseArguments.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeParseImplicitIncludeInfo.cmake
@@ -1727,24 +1796,13 @@ share/cmake-${CMAKE_API}/Modules/CMakeTe
 share/cmake-${CMAKE_API}/Modules/CMakeTestFortranCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestGNU.c
 share/cmake-${CMAKE_API}/Modules/CMakeTestJavaCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeTestOBJCCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeTestOBJCXXCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestRCCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestSwiftCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeUnixFindMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeVerifyManifest.cmake
-share/cmake-${CMAKE_API}/Modules/CPack.DS_Store.in
-share/cmake-${CMAKE_API}/Modules/CPack.Description.plist.in
-share/cmake-${CMAKE_API}/Modules/CPack.Info.plist.in
-share/cmake-${CMAKE_API}/Modules/CPack.NuGet.nuspec.in
-share/cmake-${CMAKE_API}/Modules/CPack.OSXScriptLauncher.in
-share/cmake-${CMAKE_API}/Modules/CPack.OSXScriptLauncher.rsrc.in
-share/cmake-${CMAKE_API}/Modules/CPack.OSXX11.Info.plist.in
-share/cmake-${CMAKE_API}/Modules/CPack.OSXX11.main.scpt.in
-share/cmake-${CMAKE_API}/Modules/CPack.RuntimeScript.in
-share/cmake-${CMAKE_API}/Modules/CPack.STGZ_Header.sh.in
-share/cmake-${CMAKE_API}/Modules/CPack.VolumeIcon.icns.in
-share/cmake-${CMAKE_API}/Modules/CPack.background.png.in
 share/cmake-${CMAKE_API}/Modules/CPack.cmake
-share/cmake-${CMAKE_API}/Modules/CPack.distribution.dist.in
 share/cmake-${CMAKE_API}/Modules/CPackComponent.cmake
 share/cmake-${CMAKE_API}/Modules/CPackIFW.cmake
 share/cmake-${CMAKE_API}/Modules/CPackIFWConfigureFile.cmake
@@ -1786,6 +1844,12 @@ share/cmake-${CMAKE_API}/Modules/CheckIn
 share/cmake-${CMAKE_API}/Modules/CheckLanguage.cmake
 share/cmake-${CMAKE_API}/Modules/CheckLibraryExists.cmake
 share/cmake-${CMAKE_API}/Modules/CheckLibraryExists.lists.in
+share/cmake-${CMAKE_API}/Modules/CheckOBJCCompilerFlag.cmake
+share/cmake-${CMAKE_API}/Modules/CheckOBJCSourceCompiles.cmake
+share/cmake-${CMAKE_API}/Modules/CheckOBJCSourceRuns.cmake
+share/cmake-${CMAKE_API}/Modules/CheckOBJCXXCompilerFlag.cmake
+share/cmake-${CMAKE_API}/Modules/CheckOBJCXXSourceCompiles.cmake
+share/cmake-${CMAKE_API}/Modules/CheckOBJCXXSourceRuns.cmake
 share/cmake-${CMAKE_API}/Modules/CheckPIESupported.cmake
 share/cmake-${CMAKE_API}/Modules/CheckPrototypeDefinition.c.in
 share/cmake-${CMAKE_API}/Modules/CheckPrototypeDefinition.cmake
@@ -1817,6 +1881,8 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-OBJC.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-OBJCXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Borland-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Bruce-C-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Bruce-C.cmake
@@ -1831,6 +1897,8 @@ share/cmake-${CMAKE_API}/Modules/Compile
 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-OBJC.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Clang-OBJCXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Compaq-C-DetermineCompiler.cmake
@@ -1862,6 +1930,8 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU-FindBinUtils.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/GNU-OBJC.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/GNU-OBJCXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/GNU.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/HP-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/HP-C-DetermineCompiler.cmake
@@ -2177,6 +2247,19 @@ share/cmake-${CMAKE_API}/Modules/IntelVS
 share/cmake-${CMAKE_API}/Modules/IntelVSImplicitPath/detect.cmake
 share/cmake-${CMAKE_API}/Modules/IntelVSImplicitPath/hello.f
 share/cmake-${CMAKE_API}/Modules/Internal/CMakeCheckCompilerFlag.cmake
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.DS_Store.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.Description.plist.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.Info.plist.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.NuGet.nuspec.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.OSXScriptLauncher.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.OSXScriptLauncher.rsrc.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.OSXX11.Info.plist.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.OSXX11.main.scpt.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.RuntimeScript.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.STGZ_Header.sh.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.VolumeIcon.icns.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.background.png.in
+share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPack.distribution.dist.in
 share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPackDeb.cmake
 share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPackExternal.cmake
 share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPackFreeBSD.cmake
@@ -2184,14 +2267,15 @@ share/cmake-${CMAKE_API}/Modules/Interna
 share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPackRPM.cmake
 share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPackWIX.cmake
 share/cmake-${CMAKE_API}/Modules/Internal/CPack/CPackZIP.cmake
+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/FeatureTesting.cmake
 share/cmake-${CMAKE_API}/Modules/KDE3Macros.cmake
 share/cmake-${CMAKE_API}/Modules/MacOSXBundleInfo.plist.in
 share/cmake-${CMAKE_API}/Modules/MacOSXFrameworkInfo.plist.in
 share/cmake-${CMAKE_API}/Modules/MacroAddFileDependencies.cmake
 share/cmake-${CMAKE_API}/Modules/MatlabTestsRedirect.cmake
-share/cmake-${CMAKE_API}/Modules/NSIS.InstallOptions.ini.in
-share/cmake-${CMAKE_API}/Modules/NSIS.template.in
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-Clang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-GNU-ASM.cmake
@@ -2211,6 +2295,7 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-XLClang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-XLClang.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/AIX/ExportImportList
 share/cmake-${CMAKE_API}/Modules/Platform/ARTOS-GNU-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/ARTOS.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Android-Clang-ASM.cmake
@@ -2263,14 +2348,22 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-stlport_static.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Android/ndk-stl-system.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-Absoft-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Apple-Swift.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-AppleClang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-AppleClang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-AppleClang-OBJC.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-AppleClang-OBJCXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Clang-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-Clang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Clang-OBJC.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-Clang-OBJCXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-Clang.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-GNU-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-GNU-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-GNU-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-GNU-OBJC.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Apple-GNU-OBJCXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-GNU.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-Intel-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Apple-Intel-CXX.cmake
@@ -2525,7 +2618,6 @@ share/cmake-${CMAKE_API}/Modules/UseSWIG
 share/cmake-${CMAKE_API}/Modules/Use_wxWindows.cmake
 share/cmake-${CMAKE_API}/Modules/UsewxWidgets.cmake
 share/cmake-${CMAKE_API}/Modules/VTKCompatibility.cmake
-share/cmake-${CMAKE_API}/Modules/WIX.template.in
 share/cmake-${CMAKE_API}/Modules/WriteBasicConfigVersionFile.cmake
 share/cmake-${CMAKE_API}/Modules/WriteCompilerDetectionHeader.cmake
 share/cmake-${CMAKE_API}/Modules/ecos_clean.cmake

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.148 pkgsrc/devel/cmake/distinfo:1.149
--- pkgsrc/devel/cmake/distinfo:1.148   Thu Oct 31 13:30:31 2019
+++ pkgsrc/devel/cmake/distinfo Wed Nov 27 22:32:27 2019
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.148 2019/10/31 13:30:31 adam Exp $
+$NetBSD: distinfo,v 1.149 2019/11/27 22:32:27 adam Exp $
 
-SHA1 (cmake-3.15.5.tar.gz) = 6ad813b138f173d9be37125c511a37738a964e5f
-RMD160 (cmake-3.15.5.tar.gz) = f264ed805dc48ae211c212032fc4aeb96318f226
-SHA512 (cmake-3.15.5.tar.gz) = c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6
-Size (cmake-3.15.5.tar.gz) = 9271925 bytes
-SHA1 (patch-CMakeLists.txt) = 01329182725814e27bc3945d1d62555b3a4a4033
+SHA1 (cmake-3.16.0.tar.gz) = 9943ebbbf076bbe1b54c7dadcd6df28ad0d241ed
+RMD160 (cmake-3.16.0.tar.gz) = e03aac7bb7460a2f9c2da96c91ee8371a04dc7cf
+SHA512 (cmake-3.16.0.tar.gz) = edbe16745cb82dc85f387ccdff37f3a89aa670a0e3b7dae53c3762c1cc44be1fa647156000a4ddcaac66822e3e537434ce2918da72a1ad208fa5378947ecec0d
+Size (cmake-3.16.0.tar.gz) = 9107654 bytes
+SHA1 (patch-CMakeLists.txt) = a9e91beb591fa53e9813103ce0a40a9e01117694
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
-SHA1 (patch-Modules_FindCurses.cmake) = 1372faaf1b7a1b5f5f592c797f39e1a9002a24a6
+SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0
 SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
 SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
@@ -15,11 +15,10 @@ SHA1 (patch-Modules_Platform_UnixPaths.c
 SHA1 (patch-Source_CMakeLists.txt) = 533667d43048b8bc2be17a766b5dc32f3101866e
 SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac8204cb9fe75b8c
 SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b
-SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = 69619695a17798e7bcf1416a2eb2abbca0369481
-SHA1 (patch-Source_Checks_cm_cxx_features.cmake) = 3ae61236f065729a5cf719abbad0f5be618a0548
-SHA1 (patch-Source_CursesDialog_ccmake.cxx) = d7baafe6612b6ac9b0542ed10ffcf90cd8d1df87
-SHA1 (patch-Source_cmAlgorithms.h) = c51cc61b1a95c07bd903363d4a04e1430e510516
-SHA1 (patch-Source_cmArchiveWrite.cxx) = 01977c6033a849de52b086aa4227107df3cde04e
-SHA1 (patch-Source_cm__string__view.hxx) = 9f2fa518d26dcaebb1e988c8027fb16456e1b80d
+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_cmArchiveWrite.cxx) = 1b6a46252bd10618703116ef69e22f8ec5c5f31f
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
-SHA1 (patch-bootstrap) = 9d99cfe9f9ae826250f94bc297f5a22b8de09e84
+SHA1 (patch-Utilities_std_cm_string__view) = 90bbb578c5628b661a25974d7dd9aa6f5063271f
+SHA1 (patch-bootstrap) = fc1b689bbe705cd888e2bef4debad1a26e5885bd

Index: pkgsrc/devel/cmake/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.7 pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.8
--- pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.7 Tue Oct 16 16:37:21 2018
+++ pkgsrc/devel/cmake/patches/patch-CMakeLists.txt     Wed Nov 27 22:32:27 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.7 2018/10/16 16:37:21 leot Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.8 2019/11/27 22:32:27 adam Exp $
 
 - Don't insist on ncurses.
 - NetBSD curses has wsyncup(3).
 
---- CMakeLists.txt.orig        2018-10-03 12:35:51.000000000 +0000
+--- CMakeLists.txt.orig        2019-11-26 14:18:07.000000000 +0000
 +++ CMakeLists.txt
-@@ -581,7 +581,6 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -613,7 +613,6 @@ macro (CMAKE_BUILD_UTILITIES)
      set(BUILD_CursesDialog 0)
    endif ()
    if(BUILD_CursesDialog)
@@ -13,23 +13,21 @@ $NetBSD: patch-CMakeLists.txt,v 1.7 2018
      find_package(Curses)
      if(NOT CURSES_FOUND)
        message(WARNING
-@@ -683,19 +682,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
-   # build the utilities (a macro defined in this file)
-   CMAKE_BUILD_UTILITIES()
- 
--  # On NetBSD ncurses is required, since curses doesn't have the wsyncup()
--  # function. ncurses is installed via pkgsrc, so the library is in /usr/pkg/lib,
--  # which isn't in the default linker search path. So without RPATH ccmake
--  # doesn't run and the build doesn't succeed since ccmake is executed for
--  # generating the documentation.
+@@ -719,7 +718,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+   # which isn't in the default linker search path. So without RPATH ccmake
+   # doesn't run and the build doesn't succeed since ccmake is executed for
+   # generating the documentation.
 -  if(BUILD_CursesDialog)
--    get_filename_component(_CURSES_DIR "${CURSES_LIBRARY}" PATH)
--    set(CURSES_NEED_RPATH FALSE)
--    if(NOT "${_CURSES_DIR}" STREQUAL "/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/lib64" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib64")
--      set(CURSES_NEED_RPATH TRUE)
--    endif()
--  endif()
--
++  if(FALSE)
+     get_filename_component(_CURSES_DIR "${CURSES_LIBRARY}" PATH)
+     set(CURSES_NEED_RPATH FALSE)
+     if(NOT "${_CURSES_DIR}" STREQUAL "/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/lib64" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib64")
+@@ -728,7 +727,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+   endif()
+ 
    if(BUILD_QtDialog)
-     if(APPLE)
+-    if(APPLE)
++    if(FALSE)
        set(CMAKE_BUNDLE_VERSION
+         "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
+       set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")

Index: pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake
diff -u pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake:1.2 pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake:1.3
--- pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake:1.2       Fri Jan  4 17:47:12 2019
+++ pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake   Wed Nov 27 22:32:27 2019
@@ -1,19 +1,19 @@
-$NetBSD: patch-Modules_FindCurses.cmake,v 1.2 2019/01/04 17:47:12 triaxx Exp $
+$NetBSD: patch-Modules_FindCurses.cmake,v 1.3 2019/11/27 22:32:27 adam Exp $
 
 Recognize libgnuform as valid implementation of a form library to match
 devel/ncurses. This is necessary due to cmake's insistance of scanning
 PREFIX/lib directly.
 
---- Modules/FindCurses.cmake.orig      2017-01-05 22:24:12.384738412 +0000
+--- Modules/FindCurses.cmake.orig      2019-11-26 14:18:07.000000000 +0000
 +++ Modules/FindCurses.cmake
-@@ -167,8 +167,8 @@ if(NOT DEFINED CURSES_HAVE_CURSES_H)
+@@ -225,8 +225,8 @@ if(NOT CURSES_NEED_WIDE)
    endif()
  endif()
  
--find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
--find_library(CURSES_FORM_LIBRARY form )
-+find_library(CURSES_FORM_LIBRARY form gnuform HINTS "${_cursesLibDir}")
-+find_library(CURSES_FORM_LIBRARY form gnuform)
+-find_library(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" HINTS "${_cursesLibDir}")
+-find_library(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" )
++find_library(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" gnuform HINTS "${_cursesLibDir}")
++find_library(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" gnuform)
  
  # Previous versions of FindCurses provided these values.
  if(NOT DEFINED FORM_LIBRARY)
Index: pkgsrc/devel/cmake/patches/patch-bootstrap
diff -u pkgsrc/devel/cmake/patches/patch-bootstrap:1.2 pkgsrc/devel/cmake/patches/patch-bootstrap:1.3
--- pkgsrc/devel/cmake/patches/patch-bootstrap:1.2      Thu Dec 14 22:13:34 2017
+++ pkgsrc/devel/cmake/patches/patch-bootstrap  Wed Nov 27 22:32:27 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-bootstrap,v 1.2 2017/12/14 22:13:34 adam Exp $
+$NetBSD: patch-bootstrap,v 1.3 2019/11/27 22:32:27 adam Exp $
 
 Use external libuv; the one included with cmake makes building fail.
 
---- bootstrap.orig     2017-11-20 15:19:54.000000000 +0000
+--- bootstrap.orig     2019-11-26 14:18:07.000000000 +0000
 +++ bootstrap
-@@ -1305,11 +1306,8 @@ objs=""
- for a in ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES} ${LexerParser_CXX_SOURCES} ${LexerParser_C_SOURCES} ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES}; do
+@@ -1440,11 +1440,8 @@ objs=""
+ for a in ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES} ${CMAKE_STD_CXX_SOURCES} ${LexerParser_CXX_SOURCES} ${LexerParser_C_SOURCES} ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES}; do
    objs="${objs} ${a}.o"
  done
 -for a in ${LIBUV_C_SOURCES}; do
@@ -17,7 +17,7 @@ Use external libuv; the one included wit
  
  uv_c_flags=""
  if ${cmake_system_mingw}; then
-@@ -1419,11 +1417,6 @@ for a in ${KWSYS_CXX_SOURCES}; do
+@@ -1568,11 +1565,6 @@ for a in ${KWSYS_CXX_SOURCES}; do
    echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
    echo "      ${cmake_cxx_compiler} ${cmake_cxx_flags} -DKWSYS_NAMESPACE=cmsys ${src_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
  done

Index: pkgsrc/devel/cmake/patches/patch-Source_Checks_cm__cxx17__check.cpp
diff -u pkgsrc/devel/cmake/patches/patch-Source_Checks_cm__cxx17__check.cpp:1.4 pkgsrc/devel/cmake/patches/patch-Source_Checks_cm__cxx17__check.cpp:1.5
--- pkgsrc/devel/cmake/patches/patch-Source_Checks_cm__cxx17__check.cpp:1.4     Fri Jul 19 09:06:23 2019
+++ pkgsrc/devel/cmake/patches/patch-Source_Checks_cm__cxx17__check.cpp Wed Nov 27 22:32:27 2019
@@ -1,14 +1,15 @@
-$NetBSD: patch-Source_Checks_cm__cxx17__check.cpp,v 1.4 2019/07/19 09:06:23 adam Exp $
+$NetBSD: patch-Source_Checks_cm__cxx17__check.cpp,v 1.5 2019/11/27 22:32:27 adam Exp $
 
 Test for an issue in the illumos headers related to C++17.
 
---- Source/Checks/cm_cxx17_check.cpp.orig      2019-07-17 12:07:17.000000000 +0000
+--- Source/Checks/cm_cxx17_check.cpp.orig      2019-11-26 14:18:07.000000000 +0000
 +++ Source/Checks/cm_cxx17_check.cpp
-@@ -1,7 +1,9 @@
+@@ -1,8 +1,10 @@
  #include <cstdio>
  #include <iterator>
 +#include <cassert>
  #include <memory>
+ #include <optional>
  #include <unordered_map>
 +#include <type_traits>
  

Index: pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx
diff -u pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.5 pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.6
--- pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.5 Wed Jul 19 17:44:34 2017
+++ pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx     Wed Nov 27 22:32:27 2019
@@ -1,19 +1,19 @@
-$NetBSD: patch-Source_CursesDialog_ccmake.cxx,v 1.5 2017/07/19 17:44:34 adam Exp $
+$NetBSD: patch-Source_CursesDialog_ccmake.cxx,v 1.6 2019/11/27 22:32:27 adam Exp $
 
 initscr() error path
 include cstdlib for exit
 
---- Source/CursesDialog/ccmake.cxx.orig        2017-07-18 15:22:54.000000000 +0000
+--- Source/CursesDialog/ccmake.cxx.orig        2019-11-26 14:18:07.000000000 +0000
 +++ Source/CursesDialog/ccmake.cxx
-@@ -11,6 +11,7 @@
- #include "cmake.h"
+@@ -2,6 +2,7 @@
+    file Copyright.txt or https://cmake.org/licensing for details.  */
  
- #include "cmsys/Encoding.hxx"
+ #include <csignal>
 +#include <cstdlib>
+ #include <cstring>
  #include <iostream>
- #include <signal.h>
- #include <string.h>
-@@ -49,7 +50,11 @@ void onsig(int /*unused*/)
+ #include <string>
+@@ -52,7 +53,11 @@ void onsig(int /*unused*/)
  {
    if (cmCursesForm::CurrentForm) {
      endwin();
@@ -26,7 +26,7 @@ include cstdlib for exit
      noecho();             /* Echo off */
      cbreak();             /* nl- or cr not needed */
      keypad(stdscr, true); /* Use key symbols as KEY_DOWN */
-@@ -124,7 +129,10 @@ int main(int argc, char const* const* ar
+@@ -122,7 +127,10 @@ int main(int argc, char const* const* ar
      cmCursesForm::DebugStart();
    }
  

Index: pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx
diff -u pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx:1.1 pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx:1.2
--- pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx:1.1      Fri Jul 19 09:06:23 2019
+++ pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx  Wed Nov 27 22:32:27 2019
@@ -1,18 +1,18 @@
-$NetBSD: patch-Source_cmArchiveWrite.cxx,v 1.1 2019/07/19 09:06:23 adam Exp $
+$NetBSD: patch-Source_cmArchiveWrite.cxx,v 1.2 2019/11/27 22:32:27 adam Exp $
 
 Allow older libarchive without ZSTD support.
 
---- Source/cmArchiveWrite.cxx.orig     2019-07-19 08:41:01.000000000 +0000
+--- Source/cmArchiveWrite.cxx.orig     2019-11-26 14:18:07.000000000 +0000
 +++ Source/cmArchiveWrite.cxx
-@@ -137,6 +137,7 @@ cmArchiveWrite::cmArchiveWrite(std::ostr
+@@ -141,6 +141,7 @@ cmArchiveWrite::cmArchiveWrite(std::ostr
          return;
        }
        break;
 +#ifdef ARCHIVE_FILTER_ZSTD
      case CompressZstd:
        if (archive_write_add_filter_zstd(this->Archive) != ARCHIVE_OK) {
-         this->Error = "archive_write_add_filter_zstd: ";
-@@ -144,6 +145,7 @@ cmArchiveWrite::cmArchiveWrite(std::ostr
+         this->Error = cmStrCat("archive_write_add_filter_zstd: ",
+@@ -148,6 +149,7 @@ cmArchiveWrite::cmArchiveWrite(std::ostr
          return;
        }
        break;

Added files:

Index: pkgsrc/devel/cmake-gui/DESCR
diff -u /dev/null pkgsrc/devel/cmake-gui/DESCR:1.1
--- /dev/null   Wed Nov 27 22:32:27 2019
+++ pkgsrc/devel/cmake-gui/DESCR        Wed Nov 27 22:32:27 2019
@@ -0,0 +1 @@
+Graphical interface to CMake.
Index: pkgsrc/devel/cmake-gui/Makefile
diff -u /dev/null pkgsrc/devel/cmake-gui/Makefile:1.1
--- /dev/null   Wed Nov 27 22:32:27 2019
+++ pkgsrc/devel/cmake-gui/Makefile     Wed Nov 27 22:32:27 2019
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1 2019/11/27 22:32:27 adam Exp $
+
+.include "../../devel/cmake/Makefile.common"
+
+PKGNAME=       cmake-gui-${CMAKE_VERSION}
+
+COMMENT=       CMake GUI
+
+USE_CMAKE=     yes
+BUILD_DIRS=    Source/QtDialog
+CMAKE_ARGS+=   -DBUILD_TESTING=OFF
+CMAKE_ARGS+=   -DBUILD_QtDialog=ON
+CMAKE_ARGS+=   -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
+CMAKE_ARGS+=   -DCMAKE_USE_SYSTEM_CURL=ON
+CMAKE_ARGS+=   -DCMAKE_USE_SYSTEM_EXPAT=ON
+CMAKE_ARGS+=   -DCMAKE_USE_SYSTEM_FORM=ON
+CMAKE_ARGS+=   -DCMAKE_USE_SYSTEM_JSONCPP=ON
+CMAKE_ARGS+=   -DCMAKE_USE_SYSTEM_LIBRHASH=ON
+CMAKE_ARGS+=   -DCMAKE_USE_SYSTEM_LIBUV=ON
+
+post-build:
+       cd ${WRKSRC}/bin && ${LN} -f -s ${CMAKE} cmake
+
+BUILDLINK_API_DEPENDS.libarchive+=     libarchive>=3.3.3
+.include "../../archivers/libarchive/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
+.include "../../devel/libuv/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../misc/rhash/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/jsoncpp/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/cmake-gui/PLIST
diff -u /dev/null pkgsrc/devel/cmake-gui/PLIST:1.1
--- /dev/null   Wed Nov 27 22:32:27 2019
+++ pkgsrc/devel/cmake-gui/PLIST        Wed Nov 27 22:32:27 2019
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2019/11/27 22:32:27 adam Exp $
+bin/cmake-gui
+share/applications/cmake-gui.desktop
+share/icons/hicolor/128x128/apps/CMakeSetup.png
+share/icons/hicolor/32x32/apps/CMakeSetup.png
+share/mime/packages/cmakecache.xml

Index: pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt:1.1
--- /dev/null   Wed Nov 27 22:32:27 2019
+++ pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt     Wed Nov 27 22:32:27 2019
@@ -0,0 +1,59 @@
+$NetBSD: patch-Source_QtDialog_CMakeLists.txt,v 1.1 2019/11/27 22:32:27 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
+@@ -154,7 +154,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} 
+ if(WIN32)
+   set(SRCS ${SRCS} CMakeSetup.rc)
+ endif()
+-if(APPLE)
++if(FALSE)
+   set(SRCS ${SRCS} 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'
+ ...
+ ")
+ 
+-if(APPLE)
++if(FALSE)
+   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
+   RUNTIME DESTINATION bin ${COMPONENT}
+   ${CMAKE_INSTALL_DESTINATION_ARGS})
+ 
+-if(UNIX AND NOT APPLE)
++if(UNIX)
+   foreach (size IN ITEMS 32 128)
+     install(
+       FILES       "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png"
+@@ -243,14 +243,14 @@ if(UNIX AND NOT APPLE)
+     ${COMPONENT})
+ endif()
+ 
+-if(APPLE)
++if(FALSE)
+   install(CODE "
+     execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
+         WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
+   " ${COMPONENT})
+ endif()
+ 
+-if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
++if(CMake_INSTALL_DEPENDENCIES AND WIN32)
+   # install rules for including 3rd party libs such as Qt
+   # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
+   set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
Index: pkgsrc/devel/cmake/patches/patch-Utilities_std_cm_string__view
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Utilities_std_cm_string__view:1.1
--- /dev/null   Wed Nov 27 22:32:27 2019
+++ pkgsrc/devel/cmake/patches/patch-Utilities_std_cm_string__view      Wed Nov 27 22:32:27 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-Utilities_std_cm_string__view,v 1.1 2019/11/27 22:32:27 adam Exp $
+
+<string_view> is not (yet) portable.
+
+--- Utilities/std/cm/string_view.orig  2019-11-26 14:18:07.000000000 +0000
++++ Utilities/std/cm/string_view
+@@ -6,9 +6,6 @@
+ #ifndef cm_string_view
+ #define cm_string_view
+ 
+-#if __cplusplus >= 201703L || defined(_MSVC_LANG) && _MSVC_LANG >= 201703L
+-#  define CMake_HAVE_CXX_STRING_VIEW
+-#endif
+ 
+ #ifdef CMake_HAVE_CXX_STRING_VIEW
+ #  include <string_view> // IWYU pragma: export

Prev by Date: CVS commit: pkgsrc/textproc/jsoncpp
Next by Date: CVS commit: pkgsrc/devel/cmake
Previous by Thread: CVS commit: pkgsrc/textproc/jsoncpp
Next by Thread: CVS commit: pkgsrc/devel/cmake
Indexes:

Home | Main Index | Thread Index | Old Index