Thu Dec 14 22:13:34 2017 UTC ()
cmake: updated to 3.10.1

3.10.1:
bootstrap: Check support for unordered_map from compiler mode
CPack: Fix macOS PKG component dependency information
CUDA: Treat /usr/include as an implicit include directory
server: Revert "Report backtraces in codemodel response"
CMake 3.10.1
FindMPI: Correct legacy variable handling
FindMPI: Fix multiple configure runs
FindMPI: Fix various legacy problems
IRSL: Fix MSVC variable deferencing
IAR: FindBinUtils should work for CXX as well as C
GoogleTest: Fix multiple discovery on same target
GoogleTest: Improve gtest_discover_tests messages
GoogleTest: Add timeout to discovery
GoogleTest: Add test for missing test executable
CUDA: Shared libraries on Darwin properly setup @rpath install_names
Autogen: Fix for AUTOMOC on macOS frameworks in CMake 3.10
Autogen: Tests: Add test for MacOS frameworks
Clang: Do not mistake clang-cl 6.0 for GNU-like clang


(adam)
diff -r1.19 -r1.20 pkgsrc/devel/cmake/Makefile.version
diff -r1.47 -r1.48 pkgsrc/devel/cmake/PLIST
diff -r1.110 -r1.111 pkgsrc/devel/cmake/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/cmake/patches/patch-bootstrap

cvs diff -r1.19 -r1.20 pkgsrc/devel/cmake/Attic/Makefile.version (expand / switch to unified diff)

--- pkgsrc/devel/cmake/Attic/Makefile.version 2017/11/30 15:41:17 1.19
+++ pkgsrc/devel/cmake/Attic/Makefile.version 2017/12/14 22:13:34 1.20
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1# $NetBSD: Makefile.version,v 1.19 2017/11/30 15:41:17 adam Exp $ 1# $NetBSD: Makefile.version,v 1.20 2017/12/14 22:13:34 adam Exp $
2# 2#
3# used by devel/cmake/Makefile 3# used by devel/cmake/Makefile
4# used by devel/cmake-fedora/Makefile 4# used by devel/cmake-fedora/Makefile
5CMAKE_VERSION= 3.10.0 5CMAKE_VERSION= 3.10.1
6CMAKE_API= ${CMAKE_VERSION:R} 6CMAKE_API= ${CMAKE_VERSION:R}

cvs diff -r1.47 -r1.48 pkgsrc/devel/cmake/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/cmake/PLIST 2017/11/30 15:41:17 1.47
+++ pkgsrc/devel/cmake/PLIST 2017/12/14 22:13:34 1.48
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.47 2017/11/30 15:41:17 adam Exp $ 1@comment $NetBSD: PLIST,v 1.48 2017/12/14 22:13:34 adam Exp $
2bin/ccmake 2bin/ccmake
3bin/cmake 3bin/cmake
4bin/cpack 4bin/cpack
5bin/ctest 5bin/ctest
6share/aclocal/cmake.m4 6share/aclocal/cmake.m4
7share/cmake-${CMAKE_API}/Help/command/FIND_XXX.txt 7share/cmake-${CMAKE_API}/Help/command/FIND_XXX.txt
8share/cmake-${CMAKE_API}/Help/command/FIND_XXX_ORDER.txt 8share/cmake-${CMAKE_API}/Help/command/FIND_XXX_ORDER.txt
9share/cmake-${CMAKE_API}/Help/command/FIND_XXX_ROOT.txt 9share/cmake-${CMAKE_API}/Help/command/FIND_XXX_ROOT.txt
10share/cmake-${CMAKE_API}/Help/command/add_compile_options.rst 10share/cmake-${CMAKE_API}/Help/command/add_compile_options.rst
11share/cmake-${CMAKE_API}/Help/command/add_custom_command.rst 11share/cmake-${CMAKE_API}/Help/command/add_custom_command.rst
12share/cmake-${CMAKE_API}/Help/command/add_custom_target.rst 12share/cmake-${CMAKE_API}/Help/command/add_custom_target.rst
13share/cmake-${CMAKE_API}/Help/command/add_definitions.rst 13share/cmake-${CMAKE_API}/Help/command/add_definitions.rst
14share/cmake-${CMAKE_API}/Help/command/add_dependencies.rst 14share/cmake-${CMAKE_API}/Help/command/add_dependencies.rst
@@ -2072,26 +2072,27 @@ share/cmake-${CMAKE_API}/Modules/Platfor @@ -2072,26 +2072,27 @@ share/cmake-${CMAKE_API}/Modules/Platfor
2072share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang-CXX.cmake 2072share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang-CXX.cmake
2073share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang.cmake 2073share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Clang.cmake
2074share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Determine-CXX.cmake 2074share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Determine-CXX.cmake
2075share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-C.cmake 2075share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-C.cmake
2076share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-CXX.cmake 2076share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-CXX.cmake
2077share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-Fortran.cmake 2077share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU-Fortran.cmake
2078share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU.cmake 2078share/cmake-${CMAKE_API}/Modules/Platform/Darwin-GNU.cmake
2079share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Initialize.cmake 2079share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Initialize.cmake
2080share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-C.cmake 2080share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-C.cmake
2081share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-CXX.cmake 2081share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-CXX.cmake
2082share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-Fortran.cmake 2082share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel-Fortran.cmake
2083share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel.cmake 2083share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Intel.cmake
2084share/cmake-${CMAKE_API}/Modules/Platform/Darwin-NAG-Fortran.cmake 2084share/cmake-${CMAKE_API}/Modules/Platform/Darwin-NAG-Fortran.cmake
 2085share/cmake-${CMAKE_API}/Modules/Platform/Darwin-NVIDIA-CUDA.cmake
2085share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI-C.cmake 2086share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI-C.cmake
2086share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI-CXX.cmake 2087share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI-CXX.cmake
2087share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI-Fortran.cmake 2088share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI-Fortran.cmake
2088share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI.cmake 2089share/cmake-${CMAKE_API}/Modules/Platform/Darwin-PGI.cmake
2089share/cmake-${CMAKE_API}/Modules/Platform/Darwin-VisualAge-C.cmake 2090share/cmake-${CMAKE_API}/Modules/Platform/Darwin-VisualAge-C.cmake
2090share/cmake-${CMAKE_API}/Modules/Platform/Darwin-VisualAge-CXX.cmake 2091share/cmake-${CMAKE_API}/Modules/Platform/Darwin-VisualAge-CXX.cmake
2091share/cmake-${CMAKE_API}/Modules/Platform/Darwin-XL-C.cmake 2092share/cmake-${CMAKE_API}/Modules/Platform/Darwin-XL-C.cmake
2092share/cmake-${CMAKE_API}/Modules/Platform/Darwin-XL-CXX.cmake 2093share/cmake-${CMAKE_API}/Modules/Platform/Darwin-XL-CXX.cmake
2093share/cmake-${CMAKE_API}/Modules/Platform/Darwin.cmake 2094share/cmake-${CMAKE_API}/Modules/Platform/Darwin.cmake
2094share/cmake-${CMAKE_API}/Modules/Platform/DragonFly.cmake 2095share/cmake-${CMAKE_API}/Modules/Platform/DragonFly.cmake
2095share/cmake-${CMAKE_API}/Modules/Platform/Euros.cmake 2096share/cmake-${CMAKE_API}/Modules/Platform/Euros.cmake
2096share/cmake-${CMAKE_API}/Modules/Platform/FreeBSD-Determine-CXX.cmake 2097share/cmake-${CMAKE_API}/Modules/Platform/FreeBSD-Determine-CXX.cmake
2097share/cmake-${CMAKE_API}/Modules/Platform/FreeBSD.cmake 2098share/cmake-${CMAKE_API}/Modules/Platform/FreeBSD.cmake

cvs diff -r1.110 -r1.111 pkgsrc/devel/cmake/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cmake/distinfo 2017/11/30 15:41:17 1.110
+++ pkgsrc/devel/cmake/distinfo 2017/12/14 22:13:34 1.111
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.110 2017/11/30 15:41:17 adam Exp $ 1$NetBSD: distinfo,v 1.111 2017/12/14 22:13:34 adam Exp $
2 2
3SHA1 (cmake-3.10.0.tar.gz) = b914ab1de1ebadf9f84a9afe89167ea22846b26e 3SHA1 (cmake-3.10.1.tar.gz) = 5f4074aa9ee7101d9d24eb0e2de182e2650f6b30
4RMD160 (cmake-3.10.0.tar.gz) = 03a457f0e7b9752eda04d88b4d956c9df9cb31c9 4RMD160 (cmake-3.10.1.tar.gz) = 736a185c90d7f6d94911bd7ae41e8c734219f579
5SHA512 (cmake-3.10.0.tar.gz) = 0bf05f5aacb17007d5beb0909263e31717102b685701eef45c20408895cc9dfd54c96ebc8eee148845c8ffb1d3db687e68a58d4e08395425e14ca0413ee84765 5SHA512 (cmake-3.10.1.tar.gz) = 14e9a7f01747b369cad3c4e4e83bc777c0c98ce69209456f60d086d2471302f66dc1c1d22fd04e11dcb64de4bfc7dacd9aca70ee0e5f006abd1df79ef642eeed
6Size (cmake-3.10.0.tar.gz) = 7822668 bytes 6Size (cmake-3.10.1.tar.gz) = 7824043 bytes
7SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d 7SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
8SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc 8SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
9SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f 9SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
10SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05 10SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
11SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c 11SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
12SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 38720e11b7b62cb702e80da19e044f070298f2db 12SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 38720e11b7b62cb702e80da19e044f070298f2db
13SHA1 (patch-Source_CursesDialog_ccmake.cxx) = d7baafe6612b6ac9b0542ed10ffcf90cd8d1df87 13SHA1 (patch-Source_CursesDialog_ccmake.cxx) = d7baafe6612b6ac9b0542ed10ffcf90cd8d1df87
14SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796 14SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
15SHA1 (patch-bootstrap) = 774071a20fdfa35a58b966b4051c2205df277589 15SHA1 (patch-bootstrap) = 9d99cfe9f9ae826250f94bc297f5a22b8de09e84

cvs diff -r1.1 -r1.2 pkgsrc/devel/cmake/patches/patch-bootstrap (expand / switch to unified diff)

--- pkgsrc/devel/cmake/patches/patch-bootstrap 2017/11/30 15:41:17 1.1
+++ pkgsrc/devel/cmake/patches/patch-bootstrap 2017/12/14 22:13:34 1.2
@@ -1,28 +1,19 @@ @@ -1,28 +1,19 @@
1$NetBSD: patch-bootstrap,v 1.1 2017/11/30 15:41:17 adam Exp $ 1$NetBSD: patch-bootstrap,v 1.2 2017/12/14 22:13:34 adam Exp $
2 2
3Test compiler for unordered_map; Clang 5 with -std=gnu++1z can't include it properly. 
4Use external libuv; the one included with cmake makes building fail. 3Use external libuv; the one included with cmake makes building fail.
5 4
6--- bootstrap.orig 2017-11-20 15:19:54.000000000 +0000 5--- bootstrap.orig 2017-11-20 15:19:54.000000000 +0000
7+++ bootstrap 6+++ bootstrap
8@@ -1056,6 +1056,7 @@ TMPFILE=`cmake_tmp_file` 
9 echo ' 
10 #include <iostream> 
11 #include <memory> 
12+#include <unordered_map> 
13  
14 #if __cplusplus < 201103L 
15 #error "Compiler is not in a mode aware of C++11." 
16@@ -1305,11 +1306,8 @@ objs="" 7@@ -1305,11 +1306,8 @@ objs=""
17 for a in ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES} ${LexerParser_CXX_SOURCES} ${LexerParser_C_SOURCES} ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES}; do 8 for a in ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES} ${LexerParser_CXX_SOURCES} ${LexerParser_C_SOURCES} ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES}; do
18 objs="${objs} ${a}.o" 9 objs="${objs} ${a}.o"
19 done 10 done
20-for a in ${LIBUV_C_SOURCES}; do 11-for a in ${LIBUV_C_SOURCES}; do
21- objs="${objs} uv-`cmake_obj ${a}`" 12- objs="${objs} uv-`cmake_obj ${a}`"
22-done 13-done
23  14
24-libs="" 15-libs=""
25+libs="-luv" 16+libs="-luv"
26  17
27 uv_c_flags="" 18 uv_c_flags=""
28 if ${cmake_system_mingw}; then 19 if ${cmake_system_mingw}; then