CVS commit: pkgsrc/devel/cmake

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Dec 17 12:14:35 UTC 2020

Modified Files:
        pkgsrc/devel/cmake: PLIST distinfo version.mk
        pkgsrc/devel/cmake/patches: patch-Modules_Platform_Darwin.cmake

Log Message:
cmake: updated to 3.19.2

CMake 3.19.2
* Compiler/TI: Fix C standard flags in C-only project
* execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios
* FindHDF5: improve error messages when a location variable isn't known
* FindHDF5: support the hdf5hl_fortran-based variable names
* FindPython2: avoid doubling the extension in CPython2 SOABI
* Tests: Add CMake_TEST_Java option to control Java tests
* Tests: Teach RunCMake to ignore Xcode install_name_tool signature warnings
* gitlab-ci: update macOS jobs to use Xcode 12.2
* Tests: Fix RunCMake.Check* conditions for enabling Fortran
* Check*: Tolerate variables set with names of languages
* Ninja: Clean metadata after regen during build on Windows with 1.10.2+
* ci: update to use ninja 1.10.2
* Tests: Look for Visual Studio only on Windows hosts
* CMakeDetermineCompilerId: Filter IAR-AVR format INFO strings earlier
* CMakeDetermineCompilerId: Add whitespace to clarify logic
* CMakeDetermineCompilerId: Tolerate stray text around INFO strings
* Revert "Intel: Add Intel Clang compiler identification"
* Revert "Intel: Add Intel DPC++ compiler identification"
* Tests: Add cache entry to control XCTest deployment target
* Tests: Remove outdated exclusion of tests on OS X 10.3
* ci: Hard-code XCTest deployment target to 10.15
* Utilities/Release: Add script to build Qt 5.9.9 macOS universal binaries
* ci: update to pre-built Qt 5.9.9 universal binaries for macOS packages
* ci: do not use sccache for macOS packaging
* ci: update macOS package to produce universal binaries
* macOS: Offer control over host architecture on Apple Silicon hosts
* Tests: Cover macOS host architecture selection on Apple Silicon hosts
* cmake: Clear INSTALL file properties between runs
* macOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATH on Apple Silicon
* Ninja: Remove cleandead on regeneration
* Utilities/Release: Update macOS Qt 5.9 build for platform versioning
* cmake-gui: Restore completion during path editing
* Help: xref variable that cmake_minimum_required() sets
* Help: Mention how OPTIMIZE_DEPENDENCIES is initialized
* Help: Re-sort indexes in the manuals
* Help: Clarify scope details of deferred call ids for cmake_language()
* PCH: Fix compiler errors on iOS multi-arch using Ninja Multi-Config
* export: Do not fail generation for separate namelink only case
* Cray: Fix Cray compiler detection on new platforms
* FPHSA: ensure it can be used outside 'find_package'
* Clang on Windows: 'LINKER:' prefix must be honored
* CMakePackageConfigHelpers: Relax restrictions on version range
* CUDA: Fix user-set architectures during detection with Visual Studio
* macOS: Add architecture flags only for native ASM dialect
* Modules: Rename Internal/CMake{CheckCompiler => TryCompilerOrLinker}Flag
* ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location
* ISPC: Handle OBJECT sources in different directories
* Document CMP0112 covers $
* ISPC: Treat system includes as '-I' includes
* FindGLUT: Handle Mojave and Big Sur 'tbd' framework files
* ISPC: Generated Headers suffix configurable with a better default
* Help: Fix presets typo (longDescription to displayName)
* QNX: Do not disable compiler extensions for CMake itself
* llvm-rc: Force C language for the clang gnu frontend
* llvm-rc: Add CMAKE_VFS_OVERLAY to the preprocessing flags


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/devel/cmake/PLIST
cvs rdiff -u -r1.168 -r1.169 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/cmake/version.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/cmake/patches/patch-Modules_Platform_Darwin.cmake

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/PLIST
diff -u pkgsrc/devel/cmake/PLIST:1.63 pkgsrc/devel/cmake/PLIST:1.64
--- pkgsrc/devel/cmake/PLIST:1.63       Wed Nov 25 10:33:28 2020
+++ pkgsrc/devel/cmake/PLIST    Thu Dec 17 12:14:35 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.63 2020/11/25 10:33:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.64 2020/12/17 12:14:35 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -156,6 +156,7 @@ share/cmake-${CMAKE_API}/Help/envvar/ASM
 share/cmake-${CMAKE_API}/Help/envvar/CC.rst
 share/cmake-${CMAKE_API}/Help/envvar/CCMAKE_COLORS.rst
 share/cmake-${CMAKE_API}/Help/envvar/CFLAGS.rst
+share/cmake-${CMAKE_API}/Help/envvar/CMAKE_APPLE_SILICON_PROCESSOR.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_CONFIG_TYPE.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_EXPORT_COMPILE_COMMANDS.rst
@@ -963,6 +964,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/I
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IOS_INSTALL_COMBINED.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ISPC_HEADER_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ISPC_HEADER_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ISPC_INSTRUCTION_SETS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/JOB_POOL_COMPILE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/JOB_POOL_LINK.rst
@@ -1188,6 +1190,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_STANDALONE_TOOLCHAIN.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_STL_TYPE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_APPBUNDLE_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_APPLE_SILICON_PROCESSOR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
@@ -1379,6 +1382,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ISPC_HEADER_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ISPC_HEADER_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ISPC_INSTRUCTION_SETS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOLS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
@@ -2071,8 +2075,6 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel-ISPC.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Intel.cmake
-share/cmake-${CMAKE_API}/Modules/Compiler/IntelClang-DetermineCompiler.cmake
-share/cmake-${CMAKE_API}/Modules/Compiler/IntelDPCPP-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-C-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-C.cmake
@@ -2371,7 +2373,7 @@ share/cmake-${CMAKE_API}/Modules/Install
 share/cmake-${CMAKE_API}/Modules/IntelVSImplicitPath/CMakeLists.txt
 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/CMakeTryCompilerOrLinkerFlag.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

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.168 pkgsrc/devel/cmake/distinfo:1.169
--- pkgsrc/devel/cmake/distinfo:1.168   Wed Nov 25 10:33:28 2020
+++ pkgsrc/devel/cmake/distinfo Thu Dec 17 12:14:35 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.168 2020/11/25 10:33:28 adam Exp $
+$NetBSD: distinfo,v 1.169 2020/12/17 12:14:35 adam Exp $
 
-SHA1 (cmake-3.19.1.tar.gz) = 0aec103faa6042683a42412e0f9c359c69208e2d
-RMD160 (cmake-3.19.1.tar.gz) = 24c204773d53fa1e21403070f8b86c885d9cbda4
-SHA512 (cmake-3.19.1.tar.gz) = 1a1c9a8546c80f8602babffc7fd398cea5d9163512ef74333f87e26a97ca35358bd0e90423768cfc971ebfed185e19d775737e557e0e982403b77a2ccbcd063a
-Size (cmake-3.19.1.tar.gz) = 9256956 bytes
+SHA1 (cmake-3.19.2.tar.gz) = a8096c1584a3efa5282ddb8f5b419f098099faed
+RMD160 (cmake-3.19.2.tar.gz) = b6cd816cdc5dc3baef30807e7c046d64305161a6
+SHA512 (cmake-3.19.2.tar.gz) = d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a
+Size (cmake-3.19.2.tar.gz) = 9264414 bytes
 SHA1 (patch-CMakeLists.txt) = fabdb0590f4b97c34c2242749ae3b6af18aefc0a
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
 SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0
@@ -12,7 +12,7 @@ SHA1 (patch-Modules_FindPythonInterp.cma
 SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
 SHA1 (patch-Modules_FindPython_Support.cmake) = 24ac481659fa3d5306e0e00b05c2be083a2a9906
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
-SHA1 (patch-Modules_Platform_Darwin.cmake) = 11116f5b1d1e68a1ce9f76c854d3078e8e233b7a
+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

Index: pkgsrc/devel/cmake/version.mk
diff -u pkgsrc/devel/cmake/version.mk:1.5 pkgsrc/devel/cmake/version.mk:1.6
--- pkgsrc/devel/cmake/version.mk:1.5   Wed Nov 25 10:33:28 2020
+++ pkgsrc/devel/cmake/version.mk       Thu Dec 17 12:14:35 2020
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.5 2020/11/25 10:33:28 adam Exp $
+# $NetBSD: version.mk,v 1.6 2020/12/17 12:14:35 adam Exp $
 # used by devel/cmake/Makefile.common
 # used by devel/cmake-fedora/Makefile
 
-CMAKE_VERSION= 3.19.1
+CMAKE_VERSION= 3.19.2
 CMAKE_API=     ${CMAKE_VERSION:R}

Index: pkgsrc/devel/cmake/patches/patch-Modules_Platform_Darwin.cmake
diff -u pkgsrc/devel/cmake/patches/patch-Modules_Platform_Darwin.cmake:1.1 pkgsrc/devel/cmake/patches/patch-Modules_Platform_Darwin.cmake:1.2
--- pkgsrc/devel/cmake/patches/patch-Modules_Platform_Darwin.cmake:1.1  Fri Jul 31 16:03:13 2020
+++ pkgsrc/devel/cmake/patches/patch-Modules_Platform_Darwin.cmake      Thu Dec 17 12:14:35 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-Modules_Platform_Darwin.cmake,v 1.1 2020/07/31 16:03:13 adam Exp $
+$NetBSD: patch-Modules_Platform_Darwin.cmake,v 1.2 2020/12/17 12:14:35 adam Exp $
 
 Prefer pkgsrc over system provided libraries.
 
---- Modules/Platform/Darwin.cmake.orig 2020-07-30 16:34:59.000000000 +0000
+--- Modules/Platform/Darwin.cmake.orig 2020-12-16 12:35:29.000000000 +0000
 +++ Modules/Platform/Darwin.cmake
 @@ -159,10 +159,10 @@ if(_CMAKE_OSX_SYSROOT_PATH)
    endforeach()
@@ -17,8 +17,8 @@ Prefer pkgsrc over system provided libra
    endif()
  endif()
  if (OSX_DEVELOPER_ROOT AND EXISTS "${OSX_DEVELOPER_ROOT}/Library/Frameworks")
-@@ -218,13 +218,13 @@ unset(_apps_paths)
- include(Platform/UnixPaths)
+@@ -225,13 +225,13 @@ endif()
+ 
  if(_CMAKE_OSX_SYSROOT_PATH)
    if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
 -    list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr)