diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-10-11 16:41:19 -0400 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2024-03-15 09:21:58 -0400 |
commit | 4d3fb88753c4a501adf04111cf8b3c1adfdd9b0c (patch) | |
tree | a2a7bc2b1d3584c03122bea8d90b2c7e5265af42 /test cases/rust | |
parent | 3f73aaed2da61808ba84dc992ae9e5d109b18196 (diff) | |
download | meson-4d3fb88753c4a501adf04111cf8b3c1adfdd9b0c.zip meson-4d3fb88753c4a501adf04111cf8b3c1adfdd9b0c.tar.gz meson-4d3fb88753c4a501adf04111cf8b3c1adfdd9b0c.tar.bz2 |
cargo: Add API version into dependency name
Diffstat (limited to 'test cases/rust')
-rw-r--r-- | test cases/rust/22 cargo subproject/meson.build | 2 | ||||
-rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/bar-0.1-rs.wrap (renamed from test cases/rust/22 cargo subproject/subprojects/bar-rs.wrap) | 0 | ||||
-rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/bar-0.1-rs/Cargo.toml (renamed from test cases/rust/22 cargo subproject/subprojects/bar-rs/Cargo.toml) | 0 | ||||
-rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/bar-0.1-rs/src/lib.rs (renamed from test cases/rust/22 cargo subproject/subprojects/bar-rs/src/lib.rs) | 0 | ||||
-rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/lib.c (renamed from test cases/rust/22 cargo subproject/subprojects/extra-dep-rs/lib.c) | 0 | ||||
-rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/meson.build (renamed from test cases/rust/22 cargo subproject/subprojects/extra-dep-rs/meson.build) | 2 | ||||
-rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/meson_options.txt (renamed from test cases/rust/22 cargo subproject/subprojects/extra-dep-rs/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/foo-0-rs.wrap (renamed from test cases/rust/22 cargo subproject/subprojects/foo-rs.wrap) | 0 | ||||
-rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml (renamed from test cases/rust/22 cargo subproject/subprojects/foo-rs/Cargo.toml) | 0 | ||||
-rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/foo-0-rs/lib.rs (renamed from test cases/rust/22 cargo subproject/subprojects/foo-rs/lib.rs) | 0 | ||||
-rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/foo-0-rs/meson/meson.build (renamed from test cases/rust/22 cargo subproject/subprojects/foo-rs/meson/meson.build) | 0 |
11 files changed, 2 insertions, 2 deletions
diff --git a/test cases/rust/22 cargo subproject/meson.build b/test cases/rust/22 cargo subproject/meson.build index 420e6e3..1b60014 100644 --- a/test cases/rust/22 cargo subproject/meson.build +++ b/test cases/rust/22 cargo subproject/meson.build @@ -1,6 +1,6 @@ project('cargo subproject', 'c') -foo_dep = dependency('foo-rs') +foo_dep = dependency('foo-0-rs') exe = executable('app', 'main.c', dependencies: foo_dep, ) diff --git a/test cases/rust/22 cargo subproject/subprojects/bar-rs.wrap b/test cases/rust/22 cargo subproject/subprojects/bar-0.1-rs.wrap index 99686e9..99686e9 100644 --- a/test cases/rust/22 cargo subproject/subprojects/bar-rs.wrap +++ b/test cases/rust/22 cargo subproject/subprojects/bar-0.1-rs.wrap diff --git a/test cases/rust/22 cargo subproject/subprojects/bar-rs/Cargo.toml b/test cases/rust/22 cargo subproject/subprojects/bar-0.1-rs/Cargo.toml index d60a5d8..d60a5d8 100644 --- a/test cases/rust/22 cargo subproject/subprojects/bar-rs/Cargo.toml +++ b/test cases/rust/22 cargo subproject/subprojects/bar-0.1-rs/Cargo.toml diff --git a/test cases/rust/22 cargo subproject/subprojects/bar-rs/src/lib.rs b/test cases/rust/22 cargo subproject/subprojects/bar-0.1-rs/src/lib.rs index 5b64db8..5b64db8 100644 --- a/test cases/rust/22 cargo subproject/subprojects/bar-rs/src/lib.rs +++ b/test cases/rust/22 cargo subproject/subprojects/bar-0.1-rs/src/lib.rs diff --git a/test cases/rust/22 cargo subproject/subprojects/extra-dep-rs/lib.c b/test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/lib.c index c2a0777..c2a0777 100644 --- a/test cases/rust/22 cargo subproject/subprojects/extra-dep-rs/lib.c +++ b/test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/lib.c diff --git a/test cases/rust/22 cargo subproject/subprojects/extra-dep-rs/meson.build b/test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/meson.build index 3ba7852..40d109b 100644 --- a/test cases/rust/22 cargo subproject/subprojects/extra-dep-rs/meson.build +++ b/test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/meson.build @@ -7,4 +7,4 @@ d = declare_dependency(link_with: l, variables: { 'features': 'default', }) -meson.override_dependency('extra-dep-rs', d) +meson.override_dependency('extra-dep-1-rs', d) diff --git a/test cases/rust/22 cargo subproject/subprojects/extra-dep-rs/meson_options.txt b/test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/meson_options.txt index 9311d9e..9311d9e 100644 --- a/test cases/rust/22 cargo subproject/subprojects/extra-dep-rs/meson_options.txt +++ b/test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/meson_options.txt diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-rs.wrap b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs.wrap index 99686e9..99686e9 100644 --- a/test cases/rust/22 cargo subproject/subprojects/foo-rs.wrap +++ b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs.wrap diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-rs/Cargo.toml b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml index 0f0225d..0f0225d 100644 --- a/test cases/rust/22 cargo subproject/subprojects/foo-rs/Cargo.toml +++ b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-rs/lib.rs b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/lib.rs index 1c8cbc9..1c8cbc9 100644 --- a/test cases/rust/22 cargo subproject/subprojects/foo-rs/lib.rs +++ b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/lib.rs diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-rs/meson/meson.build b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/meson/meson.build index 67c7b82..67c7b82 100644 --- a/test cases/rust/22 cargo subproject/subprojects/foo-rs/meson/meson.build +++ b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/meson/meson.build |