diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-09-20 09:01:07 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2021-09-20 13:42:07 -0400 |
| commit | e9386e80ae413e04e4fe36d46820c8346ef835e0 (patch) | |
| tree | f0e5f99e47346242cb03e8ceaa1c400c56d296c7 /test cases | |
| parent | 4e41a6203fe2d5bc37d44216bcfd865d9575a819 (diff) | |
| download | meson-e9386e80ae413e04e4fe36d46820c8346ef835e0.tar.gz | |
dependencyfallbacks: Use default_options for implicit fallbacks
This removes the warning when using default_options without fallback
kwarg completely because a subproject does not know if the main project
has an implicit fallback or not, so it could set default_options even if
not fallback is available at all.
Fixes: #9278
Diffstat (limited to 'test cases')
3 files changed, 4 insertions, 1 deletions
diff --git a/test cases/common/98 subproject subdir/meson.build b/test cases/common/98 subproject subdir/meson.build index 95bf34e42..3053b3b91 100644 --- a/test cases/common/98 subproject subdir/meson.build +++ b/test cases/common/98 subproject subdir/meson.build @@ -27,7 +27,7 @@ d = dependency('sub-notfound', fallback : 'sub_novar', required : false) assert(not d.found(), 'Dependency should be not-found') # Verify that implicit fallback works because subprojects/sub_implicit directory exists -d = dependency('sub_implicit') +d = dependency('sub_implicit', default_options: 'opt=overriden') assert(d.found(), 'Should implicitly fallback') # Verify that implicit fallback works because sub_implicit.wrap has diff --git a/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build b/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build index a1c46a1a7..9f436042f 100644 --- a/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build +++ b/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build @@ -9,3 +9,5 @@ sub_implicit_provide2_dep = dep # This one is not overridden but the wrap file tells the variable name to use. glib_dep = dep + +assert(get_option('opt') == 'overriden')
\ No newline at end of file diff --git a/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson_options.txt b/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson_options.txt new file mode 100644 index 000000000..770178ce7 --- /dev/null +++ b/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson_options.txt @@ -0,0 +1 @@ +option('opt', type: 'string', value: 'default')
\ No newline at end of file |