pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/cmake cmake: update to 3.9.3



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac18998736c1
branches:  trunk
changeset: 368995:ac18998736c1
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Sep 26 04:50:50 2017 +0000

description:
cmake: update to 3.9.3

Changes in 3.9.3 since 3.9.2:
* VS: Do not consider MAP_IMPORTED_CONFIG_ on non-imported targets
  bootstrap: Fix running multiple times in-source
* vim: Remove default setting of expandtab
* FindBoost: Add support for Boost 1.65.0 and 1.65.1 to CMake 3.9
* CTest: fix crash if source file for coverage cannot be found
* Autogen: Backport autogen target dependency as file dependency fix
* Autogen: Tests: Backport tests for _autogen target dependencies

diffstat:

 devel/cmake/Makefile.version                      |   5 +-
 devel/cmake/distinfo                              |  11 +--
 devel/cmake/patches/patch-Modules_FindBoost.cmake |  65 -----------------------
 3 files changed, 7 insertions(+), 74 deletions(-)

diffs (102 lines):

diff -r e76782b97e11 -r ac18998736c1 devel/cmake/Makefile.version
--- a/devel/cmake/Makefile.version      Tue Sep 26 03:23:30 2017 +0000
+++ b/devel/cmake/Makefile.version      Tue Sep 26 04:50:50 2017 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.version,v 1.14 2017/09/19 15:58:21 prlw1 Exp $
+# $NetBSD: Makefile.version,v 1.15 2017/09/26 04:50:50 adam Exp $
 #
 # used by devel/cmake/Makefile
 # used by devel/cmake-fedora/Makefile
-CMAKE_VERSION= 3.9.2
+CMAKE_VERSION= 3.9.3
 CMAKE_API=     ${CMAKE_VERSION:R}
-PKGREVISION=   1
diff -r e76782b97e11 -r ac18998736c1 devel/cmake/distinfo
--- a/devel/cmake/distinfo      Tue Sep 26 03:23:30 2017 +0000
+++ b/devel/cmake/distinfo      Tue Sep 26 04:50:50 2017 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.105 2017/09/19 15:58:21 prlw1 Exp $
+$NetBSD: distinfo,v 1.106 2017/09/26 04:50:50 adam Exp $
 
-SHA1 (cmake-3.9.2.tar.gz) = 99ef24c8286d87a13fc2d27bef35566cf0cc4888
-RMD160 (cmake-3.9.2.tar.gz) = 133cfee5d133675b94851a4583d9e8186eb9654d
-SHA512 (cmake-3.9.2.tar.gz) = 9528d9f39d00bb282cf36b4126c09f6884751ac68ab924893884eecbb77ea99b0e560b30e30d46faaa89417e7386f4b376e6c7c61ccf2f23948765f8607f943c
-Size (cmake-3.9.2.tar.gz) = 7703777 bytes
+SHA1 (cmake-3.9.3.tar.gz) = a373d7b7c5020b1287efcd5a26a701a920e87d9a
+RMD160 (cmake-3.9.3.tar.gz) = c1396d63aa32d43891dac04133fb477997c39c35
+SHA512 (cmake-3.9.3.tar.gz) = 30058cf4c154221846d1cd22eaf44a297d2a2d020a443f3e6f40384dfb86ee9a639a1299aa9f187f230505b2a6ee0fe69fbf5e80410711a6ac3d7a07b37f8dfc
+Size (cmake-3.9.3.tar.gz) = 7705238 bytes
 SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
-SHA1 (patch-Modules_FindBoost.cmake) = 4f79011e4921bcf8cb5fb185865fd15d05620d14
 SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
 SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
diff -r e76782b97e11 -r ac18998736c1 devel/cmake/patches/patch-Modules_FindBoost.cmake
--- a/devel/cmake/patches/patch-Modules_FindBoost.cmake Tue Sep 26 03:23:30 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-$NetBSD: patch-Modules_FindBoost.cmake,v 1.1 2017/09/19 15:58:21 prlw1 Exp $
-
-- dbba53a5 FindBoost: Add version 1.65.1
-- fa114e7d FindBoost: Add Boost 1.65 dependencies
-
---- Modules/FindBoost.cmake.orig       2017-09-07 16:10:58.000000000 +0000
-+++ Modules/FindBoost.cmake
-@@ -550,7 +550,10 @@ function(_Boost_COMPONENT_DEPENDENCIES c
-   # The addition of a new release should only require it to be run
-   # against the new release.
-   set(_Boost_IMPORTED_TARGETS TRUE)
--  if(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS 103500)
-+  if(Boost_VERSION VERSION_LESS 103300)
-+    message(WARNING "Imported targets and dependency information not available for Boost version ${Boost_VERSION} (all versions older than 1.33)")
-+    set(_Boost_IMPORTED_TARGETS FALSE)
-+  elseif(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS 103500)
-     set(_Boost_IOSTREAMS_DEPENDENCIES regex thread)
-     set(_Boost_REGEX_DEPENDENCIES thread)
-     set(_Boost_WAVE_DEPENDENCIES filesystem thread)
-@@ -764,8 +767,27 @@ function(_Boost_COMPONENT_DEPENDENCIES c
-     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
-     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
-   else()
--    message(WARNING "Imported targets not available for Boost version ${Boost_VERSION}")
--    set(_Boost_IMPORTED_TARGETS FALSE)
-+    if(NOT Boost_VERSION VERSION_LESS 106500)
-+      set(_Boost_CHRONO_DEPENDENCIES system)
-+      set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
-+      set(_Boost_COROUTINE_DEPENDENCIES context system)
-+      set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
-+      set(_Boost_FILESYSTEM_DEPENDENCIES system)
-+      set(_Boost_IOSTREAMS_DEPENDENCIES regex)
-+      set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic)
-+      set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic)
-+      set(_Boost_MPI_DEPENDENCIES serialization)
-+      set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
-+      set(_Boost_NUMPY_DEPENDENCIES python)
-+      set(_Boost_RANDOM_DEPENDENCIES system)
-+      set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
-+      set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
-+      set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
-+    endif()
-+    if(NOT Boost_VERSION VERSION_LESS 106600)
-+      message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
-+      set(_Boost_IMPORTED_TARGETS FALSE)
-+    endif()
-   endif()
- 
-   string(TOUPPER ${component} uppercomponent)
-@@ -815,6 +837,7 @@ function(_Boost_COMPONENT_HEADERS compon
-   set(_Boost_MATH_TR1L_HEADERS           "boost/math/tr1.hpp")
-   set(_Boost_MPI_HEADERS                 "boost/mpi.hpp")
-   set(_Boost_MPI_PYTHON_HEADERS          "boost/mpi/python/config.hpp")
-+  set(_Boost_NUMPY_HEADERS               "boost/python/numpy.hpp")
-   set(_Boost_PRG_EXEC_MONITOR_HEADERS    "boost/test/prg_exec_monitor.hpp")
-   set(_Boost_PROGRAM_OPTIONS_HEADERS     "boost/program_options.hpp")
-   set(_Boost_PYTHON_HEADERS              "boost/python.hpp")
-@@ -998,6 +1021,7 @@ else()
-   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
-   # _Boost_COMPONENT_DEPENDENCIES.
-   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-+    "1.65.1" "1.65.0" "1.65"
-     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
-     "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
-     "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"



Home | Main Index | Thread Index | Old Index