Commit 4a5de69e authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'FindBoost-1.73' into release-3.17

9daf79c5 FindBoost: Add support for Boost 1.73
f48051d3 FindBoost: Simplify Boost_VERSION_STRING comparisons
56b3375f

 BoostScanDeps: Fix typo in numpy handling
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !4635
parents be88264a 9daf79c5
This diff is collapsed.
......@@ -134,11 +134,17 @@ function(_Boost_FIND_COMPONENT_DEPENDENCIES component includedir _ret_libs)
continue()
endif()
if(component STREQUAL "python" AND
boost_component_match STREQUAL "numpy")
_boost_component_match STREQUAL "numpy")
# Optional python dependency; skip to avoid making it a
# hard dependency (handle as special-case for numpy).
continue()
endif()
if(component STREQUAL "nowide" AND
_boost_component_match STREQUAL "filesystem")
# Optional filesystem dependency; skip to avoid making it a
# hard dependency.
continue()
endif()
if (_boost_dep_found EQUAL -1 AND
NOT "${_boost_component_match}" STREQUAL "${component}")
list(APPEND _boost_DEPS "${_boost_component_match}")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment