mirror of
https://git.freebsd.org/ports.git
synced 2025-05-05 16:07:38 -04:00
b23ea4e2d2
Create a meta-port for CMake to make it easier for the end user and better handling of build dependencies. This pushes devel/cmake into /devel/cmake-core and splits manpages and its dependencies to /devel/cmake-man Approved by: kde (tcberner) Differential Revision: https://reviews.freebsd.org/D34957
35 lines
1.6 KiB
CMake
35 lines
1.6 KiB
CMake
--- Modules/FindBoost.cmake.orig 2022-01-25 13:45:06 UTC
|
|
+++ Modules/FindBoost.cmake
|
|
@@ -135,6 +135,9 @@ This module reads hints about search locations from va
|
|
``BOOST_LIBRARYDIR``
|
|
Preferred library directory e.g. ``<prefix>/lib``.
|
|
|
|
+``BOOST_PYTHON_SUFFIX``
|
|
+ Preferred Python version.
|
|
+
|
|
``Boost_NO_SYSTEM_PATHS``
|
|
Set to ``ON`` to disable searching in locations not
|
|
specified by these hint variables. Default is ``OFF``.
|
|
@@ -558,6 +561,9 @@ function(_boost_set_legacy_variables_from_config)
|
|
endif()
|
|
endfunction()
|
|
|
|
+# https://gitlab.kitware.com/cmake/cmake/issues/18865
|
|
+set(Boost_NO_BOOST_CMAKE ON CACHE BOOL "Disable the search for boost-cmake")
|
|
+
|
|
#-------------------------------------------------------------------------------
|
|
# Before we go searching, check whether a boost cmake package is available, unless
|
|
# the user specifically asked NOT to search for one.
|
|
@@ -2162,10 +2168,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
|
|
# Handle Python version suffixes
|
|
unset(COMPONENT_PYTHON_VERSION_MAJOR)
|
|
unset(COMPONENT_PYTHON_VERSION_MINOR)
|
|
- if(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\$")
|
|
+ if(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9])\$")
|
|
set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}")
|
|
set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}")
|
|
- elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9]+)\$")
|
|
+ elseif(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9]+)\$")
|
|
set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}")
|
|
set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}")
|
|
set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}")
|