Skip to content

feat: support pkg-config across all platforms #157

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
JyJyJcr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: support pkg-config across all platforms #157

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
2 changes: 0 additions & 2 deletions hdf5-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ deprecated = ["hdf5-src?/deprecated"]
[build-dependencies]
libloading = "0.8"
regex = { workspace = true }

[target.'cfg(any(all(unix, not(target_os = "macos")), windows))'.build-dependencies]
pkg-config = "0.3"

[target.'cfg(windows)'.build-dependencies]
Expand Down
6 changes: 1 addition & 5 deletions hdf5-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ pub struct LibrarySearcher {
pub pkg_conf_found: bool,
}

#[cfg(any(all(unix, not(target_os = "macos")), windows))]
mod pkgconf {
use super::{is_inc_dir, LibrarySearcher};

Expand Down Expand Up @@ -303,7 +302,6 @@ mod pkgconf {

#[cfg(all(unix, not(target_os = "macos")))]
mod unix {
pub use super::pkgconf::find_hdf5_via_pkg_config;
use super::{is_inc_dir, LibrarySearcher};

pub fn find_hdf5_in_default_location(config: &mut LibrarySearcher) {
Expand Down Expand Up @@ -414,7 +412,6 @@ mod macos {

#[cfg(windows)]
mod windows {
pub use super::pkgconf::find_hdf5_via_pkg_config;
use super::*;

use std::io;
Expand Down Expand Up @@ -573,9 +570,9 @@ impl LibrarySearcher {
}

pub fn try_locate_hdf5_library(&mut self) {
self::pkgconf::find_hdf5_via_pkg_config(self);
#[cfg(all(unix, not(target_os = "macos")))]
{
self::unix::find_hdf5_via_pkg_config(self);
self::unix::find_hdf5_in_default_location(self);
}
#[cfg(target_os = "macos")]
Expand All @@ -585,7 +582,6 @@ impl LibrarySearcher {
#[cfg(windows)]
{
self::windows::find_hdf5_via_winreg(self);
self::windows::find_hdf5_via_pkg_config(self);
// the check below is for dynamic linking only
self::windows::validate_env_path(self);
}
Expand Down
Loading