Skip to content

Commit

Permalink
fix: cmake prefix definitions
Browse files Browse the repository at this point in the history
uulm-janbaudisch committed Dec 1, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent a568285 commit 23a33d0
Showing 8 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion d4-arjun-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "d4-arjun-sys"
version = "0.1.2"
version = "0.1.7"
description = "A Rust wrapper around Arjun for d4."
edition = "2021"
build = "build.rs"
7 changes: 4 additions & 3 deletions d4-arjun-sys/build.rs
Original file line number Diff line number Diff line change
@@ -5,13 +5,14 @@ fn main() {
.define("BUILD_SHARED_LIBS", "OFF")
.define("MPFR_ROOT", env::var("DEP_GMP_OUT_DIR").unwrap())
.define(
"CMAKE_PREFIX_PATH",
env::var("DEP_CRYPTOMINISAT5_ROOT").unwrap(),
"cryptominisat5_DIR",
env::var("DEP_CRYPTOMINISAT5_CMAKE").unwrap(),
)
.define("CMAKE_PREFIX_PATH", env::var("DEP_SBVA_ROOT").unwrap())
.define("sbva_DIR", env::var("DEP_SBVA_CMAKE").unwrap())
.build();

println!("cargo::metadata=INCLUDE={}/include", build.display());
println!("cargo::metadata=CMAKE={}/lib/cmake/arjun", build.display());
println!("cargo::rustc-link-search=native={}/lib", build.display());
println!("cargo::rustc-link-search=native={}/lib64", build.display());
}
2 changes: 1 addition & 1 deletion d4-cryptominisat-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "d4-cryptominisat-sys"
version = "0.1.2"
version = "0.1.3"
description = "A Rust wrapper around CryptoMiniSat for d4."
edition = "2021"
build = "build.rs"
4 changes: 4 additions & 0 deletions d4-cryptominisat-sys/build.rs
Original file line number Diff line number Diff line change
@@ -33,6 +33,10 @@ fn main() {
.build();

println!("cargo::metadata=INCLUDE={}/include", build.display());
println!(
"cargo::metadata=CMAKE={}/lib/cmake/cryptominisat5",
build.display()
);
println!("cargo::rustc-link-search=native={}/lib", build.display());
println!("cargo::rustc-link-search=native={}/lib64", build.display());
}
2 changes: 1 addition & 1 deletion d4-gpmc-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "d4-gpmc-sys"
version = "0.1.2"
version = "0.1.3"
description = "A Rust wrapper around GPMC for d4."
edition = "2021"
build = "build.rs"
2 changes: 1 addition & 1 deletion d4-gpmc-sys/build.rs
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ fn main() {
let build = cmake::Config::new("d4/3rdParty/GPMC")
.define("BUILD_SHARED_LIBS", "OFF")
.define("ZLIB_ROOT", env::var("DEP_Z_ROOT").unwrap())
.define("CMAKE_PREFIX_PATH", env::var("DEP_ARJUN_ROOT").unwrap())
.define("arjun_DIR", env::var("DEP_ARJUN_CMAKE").unwrap())
.define("CMAKE_PREFIX_PATH", env::var("DEP_GMP_OUT_DIR").unwrap())
.cxxflag(format!(
"-isystem {}",
2 changes: 1 addition & 1 deletion d4-sbva-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "d4-sbva-sys"
version = "0.1.1"
version = "0.1.2"
description = "A Rust wrapper around SBVA for d4."
edition = "2021"
build = "build.rs"
3 changes: 2 additions & 1 deletion d4-sbva-sys/build.rs
Original file line number Diff line number Diff line change
@@ -4,7 +4,8 @@ fn main() {
.define("BINARY", "OFF")
.build();

println!("cargo:include={}/include", build.display());
println!("cargo::metadata=INCLUDE={}/include", build.display());
println!("cargo::metadata=CMAKE={}/lib/cmake/sbva", build.display());
println!("cargo::rustc-link-search=native={}/lib", build.display());
println!("cargo::rustc-link-search=native={}/lib64", build.display());
}

0 comments on commit 23a33d0

Please sign in to comment.