diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-21 17:47:58 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-22 21:09:25 +0200 |
| commit | c4b8e0389576202129236ba725551938764844cd (patch) | |
| tree | e21d83063da22bb79a8d7bf4d403266ea3f8b16f /test cases/common/155 subproject dir name collision | |
| parent | 0c4dd81c4db228492a483b9aade3450d0ed408e2 (diff) | |
| download | meson-c4b8e0389576202129236ba725551938764844cd.tar.gz | |
tests: both_library test improvements
This switches some `shared_library()` calls to `library()` and adds
one new CI matrix entries for -Ddefault_library={static, both}.
Diffstat (limited to 'test cases/common/155 subproject dir name collision')
3 files changed, 3 insertions, 3 deletions
diff --git a/test cases/common/155 subproject dir name collision/custom_subproject_dir/B/meson.build b/test cases/common/155 subproject dir name collision/custom_subproject_dir/B/meson.build index 280c60ce2..8f4cb023e 100644 --- a/test cases/common/155 subproject dir name collision/custom_subproject_dir/B/meson.build +++ b/test cases/common/155 subproject dir name collision/custom_subproject_dir/B/meson.build @@ -1,4 +1,4 @@ project('B', 'c') C = subproject('C') c = C.get_variable('c') -b = shared_library('b', 'b.c', link_with : c) +b = library('b', 'b.c', link_with : c) diff --git a/test cases/common/155 subproject dir name collision/custom_subproject_dir/C/meson.build b/test cases/common/155 subproject dir name collision/custom_subproject_dir/C/meson.build index abf0b1e26..5d890977e 100644 --- a/test cases/common/155 subproject dir name collision/custom_subproject_dir/C/meson.build +++ b/test cases/common/155 subproject dir name collision/custom_subproject_dir/C/meson.build @@ -1,2 +1,2 @@ project('C', 'c') -c = shared_library('c', 'c.c') +c = library('c', 'c.c') diff --git a/test cases/common/155 subproject dir name collision/other_subdir/meson.build b/test cases/common/155 subproject dir name collision/other_subdir/meson.build index 90cb67a63..37cb623ca 100644 --- a/test cases/common/155 subproject dir name collision/other_subdir/meson.build +++ b/test cases/common/155 subproject dir name collision/other_subdir/meson.build @@ -1 +1 @@ -other = shared_library('other', 'custom_subproject_dir/other.c') +other = library('other', 'custom_subproject_dir/other.c') |