Skip to content

rust - re-export libceed-sys features through libceed to allow building non-static without using libceed-sys directly #1813

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
jedbrown wants to merge 2 commits into
base: main
Choose a base branch
from
Open

rust - re-export libceed-sys features through libceed to allow building non-static without using libceed-sys directly #1813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff0d6b1
rust - re-export libceed-sys features through libceed to allow buildi…
eliasboegel Oct 16, 2024
d580076
WIP: cargo: change libceed feature `static` to `shared`
jedbrown Apr 27, 2025
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
3 changes: 1 addition & 2 deletions rust/libceed-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ include = [
]

[features]
default = ["static"]
static = []
shared = []
system = []

[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions rust/libceed-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::process::Command;

fn main() {
let out_dir = PathBuf::from(env("OUT_DIR").unwrap());
let statik = env("CARGO_FEATURE_STATIC").is_some();
let shared = env("CARGO_FEATURE_SHARED").is_some();
let system = env("CARGO_FEATURE_SYSTEM").is_some();

let ceed_pc = if system {
Expand All @@ -28,7 +28,7 @@ fn main() {
.arg("FC=") // Don't try to find Fortran (unused library build/install)
.env("MAKEFLAGS", makeflags)
.current_dir("c-src");
if statik {
if !shared {
make.arg("STATIC=1");
}
run(&mut make);
Expand All @@ -40,7 +40,7 @@ fn main() {
.into_owned()
};
pkg_config::Config::new()
.statik(statik)
.statik(!shared)
.atleast_version("0.12.0")
.probe(&ceed_pc)
.unwrap();
Expand Down
6 changes: 5 additions & 1 deletion rust/libceed/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,16 @@ keywords = ["libceed", "exascale", "high-order"]
categories = ["science"]

[dependencies]
libceed-sys = { version = "0.12", path = "../libceed-sys" }
libceed-sys = { version = "0.12", path = "../libceed-sys", default-features = false}
katexit = { version = "0.1.1", optional = true }

[dev-dependencies]
version-sync = "0.9.2"

[features]
shared = ["libceed-sys/shared"]
system = ["libceed-sys/system"]

[package.metadata.docs.rs]
features = ["katexit"]

Expand Down
Loading