Skip to content

replace system-deps with just pkg-config #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
m4rch3n1ng wants to merge 1 commit into
base: main
Choose a base branch
from
Open

replace system-deps with just pkg-config #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions libdisplay-info-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@ rustdoc-args = ["--cfg", "docsrs"]
v0_2 = []

[build-dependencies]
system-deps = "7.0.3"
pkg-config = "0.3.32"
semver = "1.0.24"

[dependencies]

[package.metadata.system-deps.libdisplay-info]
name = "libdisplay-info"
version = ">= 0.1.0, < 0.3.0"
v0_2 = { version = "0.2.0" }
12 changes: 6 additions & 6 deletions libdisplay-info-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ fn main() {
return;
}

let deps = system_deps::Config::new().probe().unwrap();
let native_lib = deps.get_by_name("libdisplay-info").unwrap();
let native_lib = pkg_config::Config::new()
.range_version("0.1.0".."0.3.0")
.probe("libdisplay-info")
.unwrap();
let native_version = semver::Version::parse(&native_lib.version).unwrap();
let has_v2 = semver::VersionReq::parse(">=0.2")
.unwrap()
.matches(&native_version);
if has_v2 {
let v2 = semver::VersionReq::parse(">=0.2").unwrap();
if v2.matches(&native_version) {
println!("cargo:rustc-cfg=feature=\"v0_2\"");
}
}