diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-03-12 10:03:24 -0500 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-03-12 22:08:33 +0100 |
| commit | 1f3bf0f1357a20d9975a2de54e0fd097fc52424f (patch) | |
| tree | 1e072df4ee539a111d355dfe1992420d904f3d29 /test cases | |
| parent | 88013815633759fd499bde9e0173aaf9024604b1 (diff) | |
| download | meson-1f3bf0f1357a20d9975a2de54e0fd097fc52424f.zip meson-1f3bf0f1357a20d9975a2de54e0fd097fc52424f.tar.gz meson-1f3bf0f1357a20d9975a2de54e0fd097fc52424f.tar.bz2 | |
interpreter: Cache found dependency before converting for include_type
Fixes: #8516.
Diffstat (limited to 'test cases')
6 files changed, 28 insertions, 0 deletions
diff --git a/test cases/common/239 dependency include_type inconsistency/bar/meson.build b/test cases/common/239 dependency include_type inconsistency/bar/meson.build new file mode 100644 index 0000000..6e1218b --- /dev/null +++ b/test cases/common/239 dependency include_type inconsistency/bar/meson.build @@ -0,0 +1,5 @@ +baz_dep = dependency('baz', + fallback: ['baz', 'baz_dep'], + include_type: 'system', + method: 'pkg-config', # if we comment this out or change to 'auto' the build is successful + required: false) diff --git a/test cases/common/239 dependency include_type inconsistency/meson.build b/test cases/common/239 dependency include_type inconsistency/meson.build new file mode 100644 index 0000000..7f28e25 --- /dev/null +++ b/test cases/common/239 dependency include_type inconsistency/meson.build @@ -0,0 +1,5 @@ +project('test', 'c', 'cpp') + +foo_dep = subproject('foo').get_variable('foo_dep') + +subdir('bar') diff --git a/test cases/common/239 dependency include_type inconsistency/subprojects/baz.wrap b/test cases/common/239 dependency include_type inconsistency/subprojects/baz.wrap new file mode 100644 index 0000000..c727794 --- /dev/null +++ b/test cases/common/239 dependency include_type inconsistency/subprojects/baz.wrap @@ -0,0 +1,3 @@ +[wrap-file] +source_url = http://host.invalid/baz.tar.gz +source_filename = baz.tar.gz diff --git a/test cases/common/239 dependency include_type inconsistency/subprojects/baz/meson.build b/test cases/common/239 dependency include_type inconsistency/subprojects/baz/meson.build new file mode 100644 index 0000000..a6a3775 --- /dev/null +++ b/test cases/common/239 dependency include_type inconsistency/subprojects/baz/meson.build @@ -0,0 +1,3 @@ +project('baz', 'cpp') + +baz_dep = declare_dependency() diff --git a/test cases/common/239 dependency include_type inconsistency/subprojects/foo.wrap b/test cases/common/239 dependency include_type inconsistency/subprojects/foo.wrap new file mode 100644 index 0000000..dcc434b --- /dev/null +++ b/test cases/common/239 dependency include_type inconsistency/subprojects/foo.wrap @@ -0,0 +1,3 @@ +[wrap-file] +source_url = http://host.invalid/foo.tar.gz +source_filename = foo.tar.gz diff --git a/test cases/common/239 dependency include_type inconsistency/subprojects/foo/meson.build b/test cases/common/239 dependency include_type inconsistency/subprojects/foo/meson.build new file mode 100644 index 0000000..51d9503 --- /dev/null +++ b/test cases/common/239 dependency include_type inconsistency/subprojects/foo/meson.build @@ -0,0 +1,9 @@ +project('foo', 'c', 'cpp') + +baz_dep = dependency('baz', + fallback: ['baz', 'baz_dep'], + include_type: 'system', + method: 'pkg-config', + required: false) + +foo_dep = declare_dependency(dependencies: baz_dep) |