diff options
Diffstat (limited to 'dev-util/cmake/files/cmake-3.9.1-boost-1.65.0.patch')
| -rw-r--r-- | dev-util/cmake/files/cmake-3.9.1-boost-1.65.0.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/dev-util/cmake/files/cmake-3.9.1-boost-1.65.0.patch b/dev-util/cmake/files/cmake-3.9.1-boost-1.65.0.patch deleted file mode 100644 index 098f5f70f3f7..000000000000 --- a/dev-util/cmake/files/cmake-3.9.1-boost-1.65.0.patch +++ /dev/null @@ -1,74 +0,0 @@ -From fa114e7d708b76f33878f6f82a6c2a2e50c1c10f Mon Sep 17 00:00:00 2001 -From: Roger Leigh <rleigh@dundee.ac.uk> -Date: Tue, 22 Aug 2017 16:09:06 +0100 -Subject: [PATCH] FindBoost: Add Boost 1.65 dependencies - ---- - Modules/FindBoost.cmake | 30 +++++++++++++++++++++++++++--- - 1 file changed, 27 insertions(+), 3 deletions(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index b4abf75..b28f2b8 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -554,7 +554,10 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - # 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) -@@ -768,8 +771,27 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - 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) -@@ -819,6 +841,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs) - 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") -@@ -1000,6 +1023,7 @@ else() - # _Boost_COMPONENT_HEADERS. See the instructions at the top of - # _Boost_COMPONENT_DEPENDENCIES. - set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} -+ "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" --- -libgit2 0.26.0 - |