diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-21 11:44:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-21 11:44:31 (GMT) |
| commit | 3465ae916f35639d90ec85ab6f2edd1d5a7f475c (patch) | |
| tree | 80be572d8beef7bbe8fe66c275206f592ebcd076 /Utilities | |
| parent | 441a5f73c0a520c8f1d00df77a07b3bd89372284 (diff) | |
| parent | 9daf79c53b65317b6c2e6d216d916a5007ced40b (diff) | |
| download | CMake-3465ae916f35639d90ec85ab6f2edd1d5a7f475c.zip CMake-3465ae916f35639d90ec85ab6f2edd1d5a7f475c.tar.gz CMake-3465ae916f35639d90ec85ab6f2edd1d5a7f475c.tar.bz2 | |
Merge topic 'FindBoost-1.73'
9daf79c53b FindBoost: Add support for Boost 1.73
f48051d33f FindBoost: Simplify Boost_VERSION_STRING comparisons
56b3375f3e BoostScanDeps: Fix typo in numpy handling
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4635
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Scripts/BoostScanDeps.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Utilities/Scripts/BoostScanDeps.cmake b/Utilities/Scripts/BoostScanDeps.cmake index 28a94ce..5794d03 100644 --- a/Utilities/Scripts/BoostScanDeps.cmake +++ b/Utilities/Scripts/BoostScanDeps.cmake @@ -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}") |