View | Details | Raw Unified | Return to bug 222207
Collapse All | Expand All

(-)b/devel/cmake/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	cmake
4
PORTNAME=	cmake
5
DISTVERSION=	3.9.2
5
DISTVERSION=	3.9.2
6
PORTREVISION=	1
6
CATEGORIES=	devel
7
CATEGORIES=	devel
7
MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
8
MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
8
9
(-)b/devel/cmake/files/patch-Modules_FindBoost.cmake (+63 lines)
Added Link Here
1
https://github.com/Kitware/CMake/commit/fa114e7d708b
2
https://github.com/Kitware/CMake/commit/dbba53a5aae0
3
4
--- Modules/FindBoost.cmake.orig	2017-05-31 14:00:09 UTC
5
+++ Modules/FindBoost.cmake
6
@@ -548,7 +548,10 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
7
   # The addition of a new release should only require it to be run
8
   # against the new release.
9
   set(_Boost_IMPORTED_TARGETS TRUE)
10
-  if(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS 103500)
11
+  if(Boost_VERSION VERSION_LESS 103300)
12
+    message(WARNING "Imported targets and dependency information not available for Boost version ${Boost_VERSION} (all versions older than 1.33)")
13
+    set(_Boost_IMPORTED_TARGETS FALSE)
14
+  elseif(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS 103500)
15
     set(_Boost_IOSTREAMS_DEPENDENCIES regex thread)
16
     set(_Boost_REGEX_DEPENDENCIES thread)
17
     set(_Boost_WAVE_DEPENDENCIES filesystem thread)
18
@@ -762,8 +765,27 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
19
     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
20
     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
21
   else()
22
-    message(WARNING "Imported targets not available for Boost version ${Boost_VERSION}")
23
-    set(_Boost_IMPORTED_TARGETS FALSE)
24
+    if(NOT Boost_VERSION VERSION_LESS 106500)
25
+      set(_Boost_CHRONO_DEPENDENCIES system)
26
+      set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
27
+      set(_Boost_COROUTINE_DEPENDENCIES context system)
28
+      set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
29
+      set(_Boost_FILESYSTEM_DEPENDENCIES system)
30
+      set(_Boost_IOSTREAMS_DEPENDENCIES regex)
31
+      set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic)
32
+      set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic)
33
+      set(_Boost_MPI_DEPENDENCIES serialization)
34
+      set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
35
+      set(_Boost_NUMPY_DEPENDENCIES python)
36
+      set(_Boost_RANDOM_DEPENDENCIES system)
37
+      set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
38
+      set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
39
+      set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
40
+    endif()
41
+    if(NOT Boost_VERSION VERSION_LESS 106600)
42
+      message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
43
+      set(_Boost_IMPORTED_TARGETS FALSE)
44
+    endif()
45
   endif()
46
 
47
   string(TOUPPER ${component} uppercomponent)
48
@@ -813,6 +835,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
49
   set(_Boost_MATH_TR1L_HEADERS           "boost/math/tr1.hpp")
50
   set(_Boost_MPI_HEADERS                 "boost/mpi.hpp")
51
   set(_Boost_MPI_PYTHON_HEADERS          "boost/mpi/python/config.hpp")
52
+  set(_Boost_NUMPY_HEADERS               "boost/python/numpy.hpp")
53
   set(_Boost_PRG_EXEC_MONITOR_HEADERS    "boost/test/prg_exec_monitor.hpp")
54
   set(_Boost_PROGRAM_OPTIONS_HEADERS     "boost/program_options.hpp")
55
   set(_Boost_PYTHON_HEADERS              "boost/python.hpp")
56
@@ -969,6 +992,7 @@ else()
57
   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
58
   # _Boost_COMPONENT_DEPENDENCIES.
59
   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
60
+    "1.65.1" "1.65.0" "1.65"
61
     "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"
62
     "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"
63
     "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"

Return to bug 222207