pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/cmake



Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Nov 22 19:14:03 UTC 2022

Modified Files:
        pkgsrc/devel/cmake: Makefile PLIST distinfo version.mk
        pkgsrc/devel/cmake/patches: patch-CMakeLists.txt
            patch-Source_QtDialog_CMakeLists.txt
Added Files:
        pkgsrc/devel/cmake/patches:
            patch-Source_Modules_CMakeBuildUtilities.cmake
Removed Files:
        pkgsrc/devel/cmake/patches: patch-Modules_FindBLAS.cmake
            patch-Modules_FindLAPACK.cmake patch-Source_CMakeLists.txt

Log Message:
cmake: updated to 3.25.0

CMake 3.25 Release Notes
************************

Changes made since CMake 3.24 include the following.

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

Presets
-------

* The "cmake-presets(7)" schema version has been bumped to "6".

* The "cmake-presets(7)" format now supports a "packagePresets" field
to specify presets for "cpack --preset".

* The "cmake-presets(7)" format now supports a "workflowPresets" field
to specify presets for "cmake --workflow".

* The "cmake-presets(7)" format now supports an "outputJUnitFile" field
to specify JUnit output in test presets

Languages
---------

* The "Compile Features" functionality is now aware of C++26, and
defines a "cxx_std_26" meta-feature. C++26 compiler modes may also
be specified via the "CXX_STANDARD", "CUDA_STANDARD",
"HIP_STANDARD", or "OBJCXX_STANDARD" target properties.

* "CUDA" language support now includes device link-time optimization
when using "nvcc".  The "CMAKE_INTERPROCEDURAL_OPTIMIZATION"
variable and the associated "INTERPROCEDURAL_OPTIMIZATION" target
property will activate device LTO.

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

* A "cmake --workflow --preset" mode was added to drive sequences of
configure, build, test, and package operations through a single
command.

* The "cmake -E capabilities" command gained a new "tls" field that
tells whether or not TLS is enabled.

* The "cmake -E env" command-line tool gained a "--modify" flag to
support "ENVIRONMENT_MODIFICATION" operations.

* The "cmake --debug-trycompile" option now prints log messages
reporting the directory in which each try-compile check is done.

Compilers
---------

* Support for the Tasking compiler toolsets (SmartCode, TriCore,
Standalone: ARM, MCS, 8051) was added with compiler id "Tasking".
See the "CMAKE_TASKING_TOOLSET" variable.

Commands
--------

* The "add_subdirectory()" command gained a "SYSTEM" option to enable
the "SYSTEM" directory property in the subdirectory.

* The "block()" and "endblock()" commands were added to manage
specific scopes (policy or variable) for a contained block of
commands.

* The "cmake_language()" command gained a new "GET_MESSAGE_LOG_LEVEL"
sub-command.  It can be used to query the current message logging
level.

* The "find_file()", "find_path()", "find_library()", and
"find_program()" commands gained a "VALIDATOR" option to specify a
function to be called for each candidate item to validate it.

* The "find_package()" command now considers paths of the form
"/*/(cmake|CMake)/*/" when searching for package
configuration files.

* The "return()" command gained a "PROPAGATE" option to propagate
variables to the scope to which control returns. See policy
"CMP0140".

* The "try_compile()" and "try_run()" commands gained new signatures
that more consistently use keyword dispatch and do not require a
binary directory to be specified.  Additionally, these signatures
use a unique directory for each invocation, which allows multiple
outputs to be preserved when using "cmake --debug-trycompile".

* The "try_compile()" and "try_run()" commands gained the option
"NO_CACHE" to store results in normal variables.

* The "try_run()" command gained "RUN_OUTPUT_STDOUT_VARIABLE" and
"RUN_OUTPUT_STDERR_VARIABLE" options to capture stdout and stderr
separately from the output of the compiled program.

Variables
---------

* The "BSD" and "CMAKE_HOST_BSD" variables are now set to a string
value when the target or host system is BSD, respectively.

* The "LINUX" and "CMAKE_HOST_LINUX" variables are now set to true
when the target or host system is Linux, respectively.

* The "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT" variable and
"MSVC_DEBUG_INFORMATION_FORMAT" target property were introduced to
select the debug information format for compilers targeting the MSVC
ABI. See policy "CMP0141".

* The "CMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION" variable and
corresponding "XCODE_SCHEME_ENABLE_GPU_API_VALIDATION" target
property were added to tell the "Xcode" generator what to put in the
scheme's "Metal: API Validation" setting.

* The "CMAKE_XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION" variable and
corresponding "XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION" target
property were added to tell the "Xcode" generator what to put in the
scheme's "Metal: Shader Validation" setting.

* The "CMAKE_XCODE_SCHEME_LAUNCH_MODE" variable and corresponding
"XCODE_SCHEME_LAUNCH_MODE" target property were added to tell the
"Xcode" generator what to put in the scheme's "Launch" mode setting.

* The "CMAKE_XCODE_SCHEME_LAUNCH_CONFIGURATION" variable and
corresponding "XCODE_SCHEME_LAUNCH_CONFIGURATION" target property
were added to tell the "Xcode" generator what configuration to put
in the scheme's Launch action.

Properties
----------

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

* The "EXPORT_NO_SYSTEM" target property was added to specify that
"install(EXPORT)" and "export()" commands will generate an imported
target with "SYSTEM" property "OFF".

* The "SYSTEM" target property was added to specify whether a target
should be treated as a system library (i.e. its include directories
are automatically "SYSTEM" when compiling consumers).  If not set,
the default is the previous behavior: on for imported targets and
off for other targets.

* The "SYSTEM" directory property was added to initialize the "SYSTEM"
target property for targets created in that directory.

Modules
-------

* The "FetchContent" module "FetchContent_Declare()" command gained a
"SYSTEM" option to enable the "SYSTEM" directory property in the
subdirectory.

* The "FindCUDAToolkit" module now provides a target for nvtx3 for
CUDA 10.0+, which supersedes nvToolsExt. A deprecation warning is
emitted when using "nvToolsExt" if the project requires CMake 3.25
and CUDA 10.0+ is used.

* The "FindDoxygen" module's version handling has been improved:

* Multiple candidate installations will now be considered, if
needed, to satisfy version constraints.  Previously, only the
first one encountered would be considered.

* Version ranges are supported.

* Variations in the version format reported by Doxygen are now
tolerated (e.g. a trailing git commit hash).

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

* The "FindOpenSP" module was added to find the OpenSP library.

* The "FindVulkan" module gained support for new components:

"dxc"
DirectX Shader Compiler.

"volk"
Volk open-source vulkan meta-loader.

CPack
-----

* The "CPack Archive Generator" gained a new
"CPACK_ARCHIVE_FILE_EXTENSION" variable to control the package file
name extension.

* The "CPack NSIS Generator" gained two new variables
"CPACK_NSIS_EXECUTABLE_PRE_ARGUMENTS" and
"CPACK_NSIS_EXECUTABLE_POST_ARGUMENTS" to provide arguments to the
nsis executable invocation.

* The "CPack" module gained the "CPACK_READELF_EXECUTABLE",
"CPACK_OBJCOPY_EXECUTABLE", and "CPACK_OBJDUMP_EXECUTABLE" variables
to control the locations of binutils used by "cpack(1)".

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

* The "IMPORTED_NO_SYSTEM" target property has been deprecated in
favor of "SYSTEM" and "EXPORT_NO_SYSTEM".

* The "Visual Studio 10 2010" generator has been removed.

* The "Visual Studio 11 2012" generator is now deprecated and will be
removed in a future version of CMake.

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

* On Windows, when targeting the MSVC ABI, the "find_library()"
command now accepts ".a" file names after first considering ".lib".
This is symmetric with existing behavior when targeting the GNU ABI,
in which the command accepts ".lib" file names after first
considering ".a".

* The "SSL_CERT_FILE" and "SSL_CERT_DIR" environment variables can now
be used to override where to find certificate authorities for
TLS/SSL operations.

* If "_CLANG_TIDY" includes a "-p" argument, the full compiler
command line is no longer appended after "--".

* The "Xcode" generator no longer adds the per-config suffix
"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)" to library search
paths. See policy "CMP0142".

----------------------------------------------------------------------------
Changes made since CMake 3.25.0-rc4:

  Help: Render guide links as normal text instead of monospace
  msvc: bless MSVC 19.34 support for C++ modules as experimental
  cmake-gui: Restore embedded version information in Windows binary
  curl: Disable schannel TLS 1.3 support on Windows 11
  Tests: Fix TryCompile bad source case for clang-cl 15 on Windows
  ci: Factor out helper to load ninja into environment on Windows
  ci: Factor out helper to load clang into environment on Windows
  ci: Simplify LLVM/Clang CI job specs on Windows
  ci: Update LLVM/Clang to 15.0 in nightly CI jobs on Windows
  gitlab-ci: Update Windows non-packaging builds to MSVC 14.34 toolset
  gitlab-ci: Update Windows packaging builds to MSVC 14.34 toolset
  CMP0141: Fix PCH REUSE_FROM when MSVC_DEBUG_INFORMATION_FORMAT is empty
  CPack/IFW: Add support for QtIFW 4.5
  IAR: Fix ASM compiler architecture detection
  Ninja: Restore support for compilers not defining a C++ standard level
  expat: Activate POSIX APIs even without compiler extensions
  cmGlobalVisualStudioGenerator: Fix compiling as C++20 in VS 2022


To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/devel/cmake/PLIST
cvs rdiff -u -r1.202 -r1.203 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/cmake/version.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/cmake/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/devel/cmake/patches/patch-Modules_FindBLAS.cmake \
    pkgsrc/devel/cmake/patches/patch-Modules_FindLAPACK.cmake
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/cmake/patches/patch-Source_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Source_Modules_CMakeBuildUtilities.cmake
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt

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.201 pkgsrc/devel/cmake/Makefile:1.202
--- pkgsrc/devel/cmake/Makefile:1.201   Fri Nov  4 19:46:48 2022
+++ pkgsrc/devel/cmake/Makefile Tue Nov 22 19:14:02 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.201 2022/11/04 19:46:48 adam Exp $
+# $NetBSD: Makefile,v 1.202 2022/11/22 19:14:02 adam Exp $
 
 .include "Makefile.common"
 
@@ -69,6 +69,7 @@ USE_CURSES=           wsyncup
 BUILDLINK_API_DEPENDS.libarchive+=     libarchive>=3.3.3
 BUILDLINK_API_DEPENDS.rhash+=  rhash>=1.4.2nb1
 .include "../../archivers/libarchive/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/libuv/buildlink3.mk"
 .include "../../misc/rhash/buildlink3.mk"

Index: pkgsrc/devel/cmake/PLIST
diff -u pkgsrc/devel/cmake/PLIST:1.72 pkgsrc/devel/cmake/PLIST:1.73
--- pkgsrc/devel/cmake/PLIST:1.72       Fri Nov  4 19:46:48 2022
+++ pkgsrc/devel/cmake/PLIST    Tue Nov 22 19:14:02 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.72 2022/11/04 19:46:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.73 2022/11/22 19:14:02 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -26,6 +26,7 @@ share/cmake-${CMAKE_API}/Help/command/ad
 share/cmake-${CMAKE_API}/Help/command/add_subdirectory.rst
 share/cmake-${CMAKE_API}/Help/command/add_test.rst
 share/cmake-${CMAKE_API}/Help/command/aux_source_directory.rst
+share/cmake-${CMAKE_API}/Help/command/block.rst
 share/cmake-${CMAKE_API}/Help/command/break.rst
 share/cmake-${CMAKE_API}/Help/command/build_command.rst
 share/cmake-${CMAKE_API}/Help/command/build_name.rst
@@ -56,6 +57,7 @@ share/cmake-${CMAKE_API}/Help/command/el
 share/cmake-${CMAKE_API}/Help/command/elseif.rst
 share/cmake-${CMAKE_API}/Help/command/enable_language.rst
 share/cmake-${CMAKE_API}/Help/command/enable_testing.rst
+share/cmake-${CMAKE_API}/Help/command/endblock.rst
 share/cmake-${CMAKE_API}/Help/command/endforeach.rst
 share/cmake-${CMAKE_API}/Help/command/endfunction.rst
 share/cmake-${CMAKE_API}/Help/command/endif.rst
@@ -199,6 +201,7 @@ share/cmake-${CMAKE_API}/Help/envvar/HIP
 share/cmake-${CMAKE_API}/Help/envvar/HIPFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/ISPC.rst
 share/cmake-${CMAKE_API}/Help/envvar/ISPCFLAGS.rst
+share/cmake-${CMAKE_API}/Help/envvar/LANG_FLAGS.txt
 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
@@ -206,6 +209,8 @@ share/cmake-${CMAKE_API}/Help/envvar/OBJ
 share/cmake-${CMAKE_API}/Help/envvar/PackageName_ROOT.rst
 share/cmake-${CMAKE_API}/Help/envvar/RC.rst
 share/cmake-${CMAKE_API}/Help/envvar/RCFLAGS.rst
+share/cmake-${CMAKE_API}/Help/envvar/SSL_CERT_DIR.rst
+share/cmake-${CMAKE_API}/Help/envvar/SSL_CERT_FILE.rst
 share/cmake-${CMAKE_API}/Help/envvar/SWIFTC.rst
 share/cmake-${CMAKE_API}/Help/envvar/VERBOSE.rst
 share/cmake-${CMAKE_API}/Help/generator/Borland Makefiles.rst
@@ -437,6 +442,7 @@ share/cmake-${CMAKE_API}/Help/module/Fin
 share/cmake-${CMAKE_API}/Help/module/FindOpenCL.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenGL.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenMP.rst
+share/cmake-${CMAKE_API}/Help/module/FindOpenSP.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenSSL.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenSceneGraph.rst
 share/cmake-${CMAKE_API}/Help/module/FindOpenThreads.rst
@@ -465,6 +471,7 @@ share/cmake-${CMAKE_API}/Help/module/Fin
 share/cmake-${CMAKE_API}/Help/module/FindRTI.rst
 share/cmake-${CMAKE_API}/Help/module/FindRuby.rst
 share/cmake-${CMAKE_API}/Help/module/FindSDL.rst
+share/cmake-${CMAKE_API}/Help/module/FindSDL_gfx.rst
 share/cmake-${CMAKE_API}/Help/module/FindSDL_image.rst
 share/cmake-${CMAKE_API}/Help/module/FindSDL_mixer.rst
 share/cmake-${CMAKE_API}/Help/module/FindSDL_net.rst
@@ -679,6 +686,9 @@ share/cmake-${CMAKE_API}/Help/policy/CMP
 share/cmake-${CMAKE_API}/Help/policy/CMP0137.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0138.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0139.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0140.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0141.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0142.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
@@ -716,6 +726,7 @@ share/cmake-${CMAKE_API}/Help/prop_dir/R
 share/cmake-${CMAKE_API}/Help/prop_dir/RULE_LAUNCH_LINK.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/SOURCE_DIR.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/SUBDIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/prop_dir/SYSTEM.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/TESTS.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/TEST_INCLUDE_FILE.rst
 share/cmake-${CMAKE_API}/Help/prop_dir/TEST_INCLUDE_FILES.rst
@@ -926,6 +937,16 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/C
 share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_STANDARD.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_STANDARD_REQUIRED.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_EXTENSIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_MODULE_DIRS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_MODULE_DIRS_NAME.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_DIRS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_DIRS_NAME.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_SET.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_SETS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_MODULE_HEADER_UNIT_SET_NAME.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_MODULE_SET.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_MODULE_SETS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_MODULE_SET_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_STANDARD.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/C_EXTENSIONS.rst
@@ -946,6 +967,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/E
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXPORT_COMPILE_COMMANDS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXPORT_NAME.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/EXPORT_NO_SYSTEM.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EXPORT_PROPERTIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/EchoString.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/FOLDER.rst
@@ -1008,6 +1030,8 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/I
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_COMPILE_DEFINITIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_CXX_MODULE_HEADER_UNIT_SETS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_CXX_MODULE_SETS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_HEADER_SETS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_HEADER_SETS_TO_VERIFY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES.rst
@@ -1075,6 +1099,8 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/M
 share/cmake-${CMAKE_API}/Help/prop_tgt/MACOSX_RPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/MANUALLY_ADDED_DEPENDENCIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/MAP_IMPORTED_CONFIG_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT-VALUES.txt
+share/cmake-${CMAKE_API}/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/MSVC_RUNTIME_LIBRARY-VALUES.txt
 share/cmake-${CMAKE_API}/Help/prop_tgt/MSVC_RUNTIME_LIBRARY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/NAME.rst
@@ -1123,6 +1149,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/S
 share/cmake-${CMAKE_API}/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst
 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/SYSTEM.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
@@ -1200,10 +1227,14 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/X
 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
+share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_ENABLE_GPU_API_VALIDATION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_ENVIRONMENT.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_EXECUTABLE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_GUARD_MALLOC.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_LAUNCH_CONFIGURATION.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_LAUNCH_MODE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_MALLOC_GUARD_EDGES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_SCHEME_MALLOC_SCRIBBLE.rst
@@ -1236,6 +1267,7 @@ share/cmake-${CMAKE_API}/Help/release/3.
 share/cmake-${CMAKE_API}/Help/release/3.22.rst
 share/cmake-${CMAKE_API}/Help/release/3.23.rst
 share/cmake-${CMAKE_API}/Help/release/3.24.rst
+share/cmake-${CMAKE_API}/Help/release/3.25.rst
 share/cmake-${CMAKE_API}/Help/release/3.3.rst
 share/cmake-${CMAKE_API}/Help/release/3.4.rst
 share/cmake-${CMAKE_API}/Help/release/3.5.rst
@@ -1248,6 +1280,7 @@ share/cmake-${CMAKE_API}/Help/release/in
 share/cmake-${CMAKE_API}/Help/variable/ANDROID.rst
 share/cmake-${CMAKE_API}/Help/variable/APPLE.rst
 share/cmake-${CMAKE_API}/Help/variable/BORLAND.rst
+share/cmake-${CMAKE_API}/Help/variable/BSD.rst
 share/cmake-${CMAKE_API}/Help/variable/BUILD_SHARED_LIBS.rst
 share/cmake-${CMAKE_API}/Help/variable/CACHE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
@@ -1457,6 +1490,8 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_HIP_STANDARD_REQUIRED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOME_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_APPLE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_BSD.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_LINUX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_SOLARIS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_SYSTEM.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst
@@ -1613,6 +1648,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MSVCIDE_RUN_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_MSVC_DEBUG_INFORMATION_FORMAT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MSVC_RUNTIME_LIBRARY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_NETRC.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_NETRC_FILE.rst
@@ -1707,6 +1743,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Swift_MODULE_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Swift_NUM_THREADS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_TASKING_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TLS_CAINFO.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TLS_VERIFY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_TOOLCHAIN_FILE.rst
@@ -1772,9 +1809,13 @@ share/cmake-${CMAKE_API}/Help/variable/C
 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
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_ENABLE_GPU_SHADER_VALIDATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_ENVIRONMENT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_GUARD_MALLOC.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_LAUNCH_CONFIGURATION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_LAUNCH_MODE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_SCHEME_MALLOC_SCRIBBLE.rst
@@ -1885,6 +1926,7 @@ share/cmake-${CMAKE_API}/Help/variable/I
 share/cmake-${CMAKE_API}/Help/variable/LIBRARY_OUTPUT_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/LINK_GROUP_PREDEFINED_FEATURES.txt
 share/cmake-${CMAKE_API}/Help/variable/LINK_LIBRARY_PREDEFINED_FEATURES.txt
+share/cmake-${CMAKE_API}/Help/variable/LINUX.rst
 share/cmake-${CMAKE_API}/Help/variable/MINGW.rst
 share/cmake-${CMAKE_API}/Help/variable/MSVC.rst
 share/cmake-${CMAKE_API}/Help/variable/MSVC10.rst
@@ -2262,6 +2304,7 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM-FindBinUtils.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/IntelLLVM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/LCC-C-DetermineCompiler.cmake
@@ -2328,6 +2371,12 @@ share/cmake-${CMAKE_API}/Modules/Compile
 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/Tasking-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Tasking-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Tasking-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Tasking-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Tasking-FindBinUtils.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Tasking.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
@@ -2478,6 +2527,7 @@ share/cmake-${CMAKE_API}/Modules/FindOpe
 share/cmake-${CMAKE_API}/Modules/FindOpenCL.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenGL.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenMP.cmake
+share/cmake-${CMAKE_API}/Modules/FindOpenSP.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenSSL.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenSceneGraph.cmake
 share/cmake-${CMAKE_API}/Modules/FindOpenThreads.cmake
@@ -2507,6 +2557,7 @@ share/cmake-${CMAKE_API}/Modules/FindQui
 share/cmake-${CMAKE_API}/Modules/FindRTI.cmake
 share/cmake-${CMAKE_API}/Modules/FindRuby.cmake
 share/cmake-${CMAKE_API}/Modules/FindSDL.cmake
+share/cmake-${CMAKE_API}/Modules/FindSDL_gfx.cmake
 share/cmake-${CMAKE_API}/Modules/FindSDL_image.cmake
 share/cmake-${CMAKE_API}/Modules/FindSDL_mixer.cmake
 share/cmake-${CMAKE_API}/Modules/FindSDL_net.cmake
@@ -2893,6 +2944,14 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/RISCos.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/SCO_SV.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/SINIX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SerenityOS-Clang-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SerenityOS-Clang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SerenityOS-Clang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SerenityOS-GNU-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SerenityOS-GNU-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SerenityOS-GNU-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SerenityOS-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SerenityOS.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/SunOS-Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/SunOS-Clang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/SunOS-Clang-Fortran.cmake
@@ -2916,6 +2975,7 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Clang-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Clang-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-Clang-HIP.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Clang.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Determine-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero-C.cmake

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.202 pkgsrc/devel/cmake/distinfo:1.203
--- pkgsrc/devel/cmake/distinfo:1.202   Fri Nov  4 19:46:48 2022
+++ pkgsrc/devel/cmake/distinfo Tue Nov 22 19:14:02 2022
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.202 2022/11/04 19:46:48 adam Exp $
+$NetBSD: distinfo,v 1.203 2022/11/22 19:14:02 adam Exp $
 
-BLAKE2s (cmake-3.24.3.tar.gz) = 501b5f514f6c7eb939d0c7e55de21c0512523e40a901d388b4bfd2b8eddf5a6d
-SHA512 (cmake-3.24.3.tar.gz) = 57edf2a8c1c9edeed7fd11271083f333d940b31e0e909d9c71671465961559c505e4e22f36e68bfe1a40a01eb05fe94bc8d37b062f9be613f959f864207e3764
-Size (cmake-3.24.3.tar.gz) = 10399876 bytes
+BLAKE2s (cmake-3.25.0.tar.gz) = 49cb2f8e4598da62d7da3a22e8d7c57c6d37bae72dc09ef4a6e39899e2b7e5f0
+SHA512 (cmake-3.25.0.tar.gz) = f6e527161b8501c72b71a95ff7a0cf304ae02a214086ff58dd686543243d939e83faf94780cda477b19e4d42e4b8f1ff96c52f98e8f7f717e102a5229f4dd44c
+Size (cmake-3.25.0.tar.gz) = 10560389 bytes
 SHA1 (patch-Auxiliary_CMakeLists.txt) = 7a26ef79be53b9d0370029e83f203440aa0be2a4
-SHA1 (patch-CMakeLists.txt) = 500b8645e7fbfa54dd97555432c453a1b0a57ff3
+SHA1 (patch-CMakeLists.txt) = 0fb79458828a021a96e350bc4cf12875914f868b
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
-SHA1 (patch-Modules_FindBLAS.cmake) = 08bd13da02b78c16af5ee0bf47e2fd1c515925b1
 SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0
 SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee
-SHA1 (patch-Modules_FindLAPACK.cmake) = ded20237fdc8b3e9c488102367c0ee33713c21be
 SHA1 (patch-Modules_FindOpenGL.cmake) = 365d422b50a1b1279cab04a8fd11e05633f52833
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
 SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
@@ -17,10 +15,10 @@ SHA1 (patch-Modules_FindPython_Support.c
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
 SHA1 (patch-Modules_Platform_Darwin.cmake) = 7629f034111ff64b144ff41316299d5edcfe081a
 SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c
-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) = d5e2708df6fcda078b1b5ea59264c663d2633ced
-SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 0858da256bba174694a165d5f910eedb3faa06d5
+SHA1 (patch-Source_Modules_CMakeBuildUtilities.cmake) = 7046fb8a0d2aadb81e027d8e2f1a4bccf2bd79cf
+SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 1cefaa7ee6cd09e84d699ea54844ae3811d890f7
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-bootstrap) = e34f5b888790e766338086b8c3680be79b71ef18

Index: pkgsrc/devel/cmake/version.mk
diff -u pkgsrc/devel/cmake/version.mk:1.31 pkgsrc/devel/cmake/version.mk:1.32
--- pkgsrc/devel/cmake/version.mk:1.31  Fri Nov  4 19:46:48 2022
+++ pkgsrc/devel/cmake/version.mk       Tue Nov 22 19:14:02 2022
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.31 2022/11/04 19:46:48 adam Exp $
+# $NetBSD: version.mk,v 1.32 2022/11/22 19:14:02 adam Exp $
 # used by devel/cmake/Makefile.common
 # used by devel/cmake-fedora/Makefile
 
-CMAKE_VERSION= 3.24.3
+CMAKE_VERSION= 3.25.0
 CMAKE_API=     ${CMAKE_VERSION:R}

Index: pkgsrc/devel/cmake/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.10 pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.11
--- pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.10        Mon Apr 18 11:01:33 2022
+++ pkgsrc/devel/cmake/patches/patch-CMakeLists.txt     Tue Nov 22 19:14:03 2022
@@ -1,20 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.10 2022/04/18 11:01:33 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.11 2022/11/22 19:14:03 adam Exp $
 
-Don't insist on ncurses.
 On Darwin, don't make application bundle.
 
---- CMakeLists.txt.orig        2022-04-12 14:06:39.000000000 +0000
+--- CMakeLists.txt.orig        2022-11-16 14:42:03.000000000 +0000
 +++ CMakeLists.txt
-@@ -681,7 +681,6 @@ macro (CMAKE_BUILD_UTILITIES)
-   endif ()
-   if(BUILD_CursesDialog)
-     if(UNIX)
--      set(CURSES_NEED_NCURSES TRUE)
-       find_package(Curses)
-       if(NOT CURSES_FOUND)
-         message(WARNING
-@@ -792,7 +791,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
-   CMAKE_BUILD_UTILITIES()
+@@ -403,7 +403,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+   include(CMakeBuildUtilities)
  
    if(BUILD_QtDialog)
 -    if(APPLE)

Index: pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt
diff -u pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt:1.4 pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt:1.5
--- pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt:1.4 Wed Mar 31 07:43:39 2021
+++ pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt     Tue Nov 22 19:14:03 2022
@@ -1,27 +1,28 @@
-$NetBSD: patch-Source_QtDialog_CMakeLists.txt,v 1.4 2021/03/31 07:43:39 adam Exp $
+$NetBSD: patch-Source_QtDialog_CMakeLists.txt,v 1.5 2022/11/22 19:14:03 adam Exp $
 
 Do not make app bundle on Darwin.
 
---- Source/QtDialog/CMakeLists.txt.orig        2021-03-23 15:43:17.000000000 +0000
+--- Source/QtDialog/CMakeLists.txt.orig        2022-11-16 14:42:03.000000000 +0000
 +++ Source/QtDialog/CMakeLists.txt
-@@ -243,14 +243,14 @@ target_link_libraries(CMakeGUILib PUBLIC
- add_library(CMakeGUIMainLib STATIC CMakeSetup.cxx)
- target_link_libraries(CMakeGUIMainLib PUBLIC CMakeGUILib)
- 
--add_executable(cmake-gui WIN32 MACOSX_BUNDLE CMakeGUIExec.cxx ${MANIFEST_FILE})
-+add_executable(cmake-gui WIN32 CMakeGUIExec.cxx ${MANIFEST_FILE})
- target_link_libraries(cmake-gui CMakeGUIMainLib Qt${INSTALLED_QT_VERSION}::Core)
- 
- target_sources(CMakeGUIMainLib INTERFACE $<TARGET_OBJECTS:CMakeGUIQRCLib>)
+@@ -256,7 +256,7 @@ target_link_libraries(
+     CMakeGUILib
+   )
+ 
+-add_executable(cmake-gui WIN32 MACOSX_BUNDLE CMakeGUIExec.cxx)
++add_executable(cmake-gui WIN32 CMakeGUIExec.cxx)
+ target_link_libraries(cmake-gui
+   PRIVATE
+     CMakeGUIMainLib
+@@ -269,7 +269,7 @@ target_link_libraries(cmake-gui
  if(WIN32)
-   target_sources(CMakeGUIMainLib INTERFACE $<TARGET_OBJECTS:CMakeVersion> CMakeSetup.rc)
+   target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.rc)
  endif()
 -if(APPLE)
 +if(FALSE)
    target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.icns)
    set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
    set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -280,7 +280,7 @@ Checks: '-*,llvm-twine-local'
+@@ -299,7 +299,7 @@ Checks: '-*,llvm-twine-local'
  ...
  ")
  
@@ -30,16 +31,16 @@ 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")
  
-@@ -307,7 +307,7 @@ install(TARGETS cmake-gui
+@@ -324,7 +324,7 @@ install(TARGETS cmake-gui
    RUNTIME DESTINATION bin ${COMPONENT}
-   ${CMAKE_INSTALL_DESTINATION_ARGS})
+   BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" ${COMPONENT})
  
 -if(UNIX AND NOT APPLE)
 +if(UNIX)
-   foreach (size IN ITEMS 32 128)
+   foreach(size IN ITEMS 32 128)
      install(
        FILES       "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png"
-@@ -326,14 +326,14 @@ if(UNIX AND NOT APPLE)
+@@ -343,14 +343,14 @@ if(UNIX AND NOT APPLE)
      ${COMPONENT})
  endif()
  

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Source_Modules_CMakeBuildUtilities.cmake
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Source_Modules_CMakeBuildUtilities.cmake:1.1
--- /dev/null   Tue Nov 22 19:14:03 2022
+++ pkgsrc/devel/cmake/patches/patch-Source_Modules_CMakeBuildUtilities.cmake   Tue Nov 22 19:14:03 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-Source_Modules_CMakeBuildUtilities.cmake,v 1.1 2022/11/22 19:14:03 adam Exp $
+
+Don't insist on ncurses.
+
+--- Source/Modules/CMakeBuildUtilities.cmake.orig      2022-11-22 18:51:08.946372477 +0000
++++ Source/Modules/CMakeBuildUtilities.cmake
+@@ -352,7 +352,6 @@ if(NOT DEFINED BUILD_CursesDialog)
+ endif()
+ if(BUILD_CursesDialog)
+   if(UNIX)
+-    set(CURSES_NEED_NCURSES TRUE)
+     find_package(Curses)
+     if(NOT CURSES_FOUND)
+       message(WARNING



Home | Main Index | Thread Index | Old Index