Skip to content

Commit 9cb4afc

Browse files
committed
Revert "Check for header only Boost libraries."
This reverts commit 6a9a816.
1 parent d2e2077 commit 9cb4afc

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

mesonbuild/dependencies/boost.py

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -451,10 +451,6 @@ def run_check(self, inc_dirs: T.List[BoostIncludeDir], lib_dirs: T.List[Path]) -
451451
break
452452
libs = sorted(set(libs))
453453

454-
any_libs_found = len(libs) > 0
455-
if not any_libs_found:
456-
return False
457-
458454
modules = ['boost_' + x for x in self.modules]
459455
for inc in inc_dirs:
460456
mlog.debug(f' - found boost {inc.version} include dir: {inc.path}')
@@ -465,7 +461,7 @@ def run_check(self, inc_dirs: T.List[BoostIncludeDir], lib_dirs: T.List[Path]) -
465461
mlog.debug(f' - {j}')
466462

467463
# 3. Select the libraries matching the requested modules
468-
not_found_as_libs: T.List[str] = []
464+
not_found: T.List[str] = []
469465
selected_modules: T.List[BoostLibraryFile] = []
470466
for mod in modules:
471467
found = False
@@ -475,21 +471,7 @@ def run_check(self, inc_dirs: T.List[BoostIncludeDir], lib_dirs: T.List[Path]) -
475471
found = True
476472
break
477473
if not found:
478-
not_found_as_libs += [mod]
479-
480-
# If a lib is not found, but an include directory exists,
481-
# assume it is a header only module.
482-
not_found: T.List[str] = []
483-
for boost_modulename in not_found_as_libs:
484-
assert boost_modulename.startswith('boost_')
485-
include_subdir = boost_modulename.replace('boost_', 'boost/', 1)
486-
headerdir_found = False
487-
for inc_dir in inc_dirs:
488-
if (inc_dir.path / include_subdir).is_dir():
489-
headerdir_found = True
490-
break
491-
if not headerdir_found:
492-
not_found.append(boost_modulename)
474+
not_found += [mod]
493475

494476
# log the result
495477
mlog.debug(' - found:')

0 commit comments

Comments
 (0)