Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implicit dependency fallback when a subproject wrap or dir exists #6902

Merged
merged 12 commits into from
Jul 1, 2020
Merged

Implicit dependency fallback when a subproject wrap or dir exists #6902

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
56c9e95
Implicit dependency fallback when a subproject wrap or dir exists
xclaesse Apr 4, 2020
2a7f728
wrap: Add 'provide' section
xclaesse Apr 5, 2020
71804e5
wrap: Add special 'dependency_names' key in [provide] section
xclaesse Apr 13, 2020
288d1ae
wrap: Do not fallback implicitly on optional dependency
xclaesse Apr 15, 2020
f08eed3
find_program: Fallback if a wrap file provide the program name
xclaesse Apr 20, 2020
fba796c
Fix typo: coma->comma
xclaesse May 29, 2020
13316f9
wrap: Refactor to split wraps dictionary into 3 separate dicts
xclaesse Jun 4, 2020
41aefd2
wrap: Abort if multiple wraps provide the same dep or program
xclaesse Jun 12, 2020
95c3fee
wrap: Update doc to give dependency_names example first
xclaesse Jun 12, 2020
f7a07ee
interpreter: Already configured fallback should be used for optional dep
xclaesse Jun 24, 2020
7c90639
interpreter: Don't abort if dep isn't required and sub didn't override
xclaesse Jun 24, 2020
5764939
wrap: Add failing unit test for fallback consistency
xclaesse Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
wrap: Do not fallback implicitly on optional dependency 
This fix the following common pattern, we don't want to implicitly
fallback on the first line:

foo_dep = dependency('foo', required: false)
if not foo_dep.found()
  foo_dep = cc.find_library('foo', required : false)
  if not foo_dep.found()
    foo_dep = dependency('foo', fallback: 'foo')
  endif
endif
  • Loading branch information
@xclaesse
xclaesse committed Jul 1, 2020
commit 288d1ae5a5de13c8844635023caf27378df4919b
7 changes: 5 additions & 2 deletions mesonbuild/interpreter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3552,8 +3552,11 @@ def dependency_impl(self, name, display_name, kwargs):
return self.notfound_dependency()

has_fallback = 'fallback' in kwargs
if not has_fallback and name:
# Add an implicit fallback if we have a wrap file or a directory with the same name.
if not has_fallback and name and required:
# Add an implicit fallback if we have a wrap file or a directory with the same name,
# but only if this dependency is required. It is common to first check for a pkg-config,
# then fallback to use find_library() and only afterward check again the dependency
# with a fallback.
provider = self.environment.wrap_resolver.find_provider(name)
if provider:
kwargs['fallback'] = provider
Expand Down