diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-10-13 16:10:29 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-10-13 23:51:25 +0300 |
| commit | e00df9046defea68ca449635d9ce3e849bc70807 (patch) | |
| tree | bf3a1760aea16b8856f4d22359663eb48760099e | |
| parent | 3372c58ca633e2bc7d5b36bcd7e0d14d12e0f82a (diff) | |
| download | meson-e00df9046defea68ca449635d9ce3e849bc70807.zip meson-e00df9046defea68ca449635d9ce3e849bc70807.tar.gz meson-e00df9046defea68ca449635d9ce3e849bc70807.tar.bz2 | |
include_type: honor include_type in dependency fallbacks (fixes #7503)
| -rw-r--r-- | mesonbuild/interpreter.py | 8 | ||||
| -rw-r--r-- | test cases/common/226 include_type dependency/meson.build | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index be19af3..f25a6f3 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3687,9 +3687,17 @@ external dependencies (including libraries) must go to "dependencies".''') if not_found_message: self.message_impl([not_found_message]) raise + assert isinstance(d, DependencyHolder) if not d.found() and not_found_message: self.message_impl([not_found_message]) self.message_impl([not_found_message]) + # Ensure the correct include type + if 'include_type' in kwargs: + wanted = kwargs['include_type'] + actual = d.include_type_method([], {}) + if wanted != actual: + mlog.debug('Current include type of {} is {}. Converting to requested {}'.format(name, actual, wanted)) + d = d.as_system_method([wanted], {}) # Override this dependency to have consistent results in subsequent # dependency lookups. if name and d.found(): diff --git a/test cases/common/226 include_type dependency/meson.build b/test cases/common/226 include_type dependency/meson.build index d17e920..fe21dbb 100644 --- a/test cases/common/226 include_type dependency/meson.build +++ b/test cases/common/226 include_type dependency/meson.build @@ -33,6 +33,9 @@ sp_dep_sys = sp_dep.as_system('system') assert(sp_dep_sys.include_type() == 'system', 'changing include_type works') assert(sp_dep.include_type() == 'preserve', 'as_system must not mutate the original object') +fallback = dependency('sdffgagf_does_not_exist', include_type: 'system', fallback: ['subDep', 'subDep_dep']) +assert(fallback.include_type() == 'system', 'include_type works with dependency fallback') + # Check that PCH works with `include_type : 'system'` See https://github.com/mesonbuild/meson/issues/7167 main_exe = executable('main_exe', 'main.cpp', cpp_pch: 'pch/test.hpp', dependencies: boost_dep) test('main_test', main_exe) |