summaryrefslogtreecommitdiff
path: root/Utilities/Scripts
diff options
context:
space:
mode:
authorAlexander Grund <Flamefire@users.noreply.github.com>2020-04-19 16:06:29 +0200
committerBrad King <brad.king@kitware.com>2020-04-20 08:27:32 -0400
commit9daf79c53b65317b6c2e6d216d916a5007ced40b (patch)
tree3782e36a8d2b78c816cfda63c1c8a41571746bc9 /Utilities/Scripts
parentf48051d33f1f6b2ff252744205810475645349ec (diff)
downloadcmake-9daf79c53b65317b6c2e6d216d916a5007ced40b.tar.gz
FindBoost: Add support for Boost 1.73
Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.73.0 sources to compute dependencies. This includes a new Boost.Nowide library. Special case: Boost.Filesystem is an optional dependency as the include is only required to make Boost.Filesystem use UTF-8 paths on user request
Diffstat (limited to 'Utilities/Scripts')
-rw-r--r--Utilities/Scripts/BoostScanDeps.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/Utilities/Scripts/BoostScanDeps.cmake b/Utilities/Scripts/BoostScanDeps.cmake
index 9e6d358b44..5794d03e89 100644
--- a/Utilities/Scripts/BoostScanDeps.cmake
+++ b/Utilities/Scripts/BoostScanDeps.cmake
@@ -139,6 +139,12 @@ function(_Boost_FIND_COMPONENT_DEPENDENCIES component includedir _ret_libs)
# 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}")