From 40229d65ea46ae97e4b0d8ee2a50fe3564547e23 Mon Sep 17 00:00:00 2001 From: Ben Ford Date: Fri, 18 Oct 2024 13:53:26 +0100 Subject: [PATCH] Add versions to link properties in manifest --- crates/cxx-qt-lib-extras/Cargo.toml | 2 +- crates/cxx-qt-lib-extras/build.rs | 2 +- crates/cxx-qt-lib/Cargo.toml | 2 +- crates/cxx-qt-lib/build.rs | 2 +- crates/cxx-qt/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/cxx-qt-lib-extras/Cargo.toml b/crates/cxx-qt-lib-extras/Cargo.toml index 1782d1c87..f1fa176d9 100644 --- a/crates/cxx-qt-lib-extras/Cargo.toml +++ b/crates/cxx-qt-lib-extras/Cargo.toml @@ -11,7 +11,7 @@ license.workspace = true description = "Extra Qt types for integrating `cxx-qt` crate with `cxx` that are not available in `cxx-qt-lib`" repository.workspace = true -links = "cxx-qt-lib-extras" +links = "cxx-qt-lib-extras-0-6-1" [dependencies] cxx.workspace = true diff --git a/crates/cxx-qt-lib-extras/build.rs b/crates/cxx-qt-lib-extras/build.rs index 7900a3c81..50b42672a 100644 --- a/crates/cxx-qt-lib-extras/build.rs +++ b/crates/cxx-qt-lib-extras/build.rs @@ -46,7 +46,7 @@ fn main() { // Disable exporting the standard include directory, as we are exporting custom headers .export_include_prefixes([]) .export_include_directory(header_dir(), "cxx-qt-lib-extras") - .reexport_dependency("cxx-qt-lib"); + .reexport_dependency("cxx-qt-lib-0-6-1"); let mut builder = CxxQtBuilder::library(interface) .qt_module("Gui") diff --git a/crates/cxx-qt-lib/Cargo.toml b/crates/cxx-qt-lib/Cargo.toml index 34546a676..99a52c4d0 100644 --- a/crates/cxx-qt-lib/Cargo.toml +++ b/crates/cxx-qt-lib/Cargo.toml @@ -17,7 +17,7 @@ exclude = [ "**/generate.sh" ] # to make sure the build scripts are run in the correct order and the build scripts # can pass metadata from library to dependent. # See also: https://doc.rust-lang.org/cargo/reference/build-scripts.html#the-links-manifest-key -links = "cxx-qt-lib" +links = "cxx-qt-lib-0-6-1" [dependencies] cxx.workspace = true diff --git a/crates/cxx-qt-lib/build.rs b/crates/cxx-qt-lib/build.rs index 5dd84e72a..9b86ef42a 100644 --- a/crates/cxx-qt-lib/build.rs +++ b/crates/cxx-qt-lib/build.rs @@ -314,7 +314,7 @@ fn main() { .initializer("src/core/init.cpp") .export_include_prefixes([]) .export_include_directory(header_dir(), "cxx-qt-lib") - .reexport_dependency("cxx-qt"); + .reexport_dependency("cxx-qt-0-6-1"); if qt_gui_enabled() { interface = interface diff --git a/crates/cxx-qt/Cargo.toml b/crates/cxx-qt/Cargo.toml index 3b06a6f71..0e83c7775 100644 --- a/crates/cxx-qt/Cargo.toml +++ b/crates/cxx-qt/Cargo.toml @@ -21,7 +21,7 @@ categories = ["api-bindings", "gui"] # to make sure the build scripts are run in the correct order and the build scripts # can pass metadata from library to dependent. # See also: https://doc.rust-lang.org/cargo/reference/build-scripts.html#the-links-manifest-key -links = "cxx-qt" +links = "cxx-qt-0-6-1" [dependencies] cxx.workspace = true