seoxi/magick-rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split the pkg-config version and flags checks

Browse Source 
Apparently, on RHEL 6.7, pkg-config doesn't let you check versions and
output flags in the same command run.
This commit is contained in:
Pete Gadomski
2017-04-10 08:13:36 -06:00
parent 00749a2d3d
commit d39972da88
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.rs
View File

@ -29,11 +29,14 @@ static HEADER: &'static str = "#include <wand/MagickWand.h>\n";
fn main() { fn main() {
// Assert that the appropriate version of MagickWand is installed, // Assert that the appropriate version of MagickWand is installed,
// since we are very dependent on the particulars of MagickWand. // since we are very dependent on the particulars of MagickWand.
let library = pkg_config::Config::new() pkg_config::Config::new()
.atleast_version(MIN_VERSION) .atleast_version(MIN_VERSION)
.arg(format!("--max-version={}", MAX_VERSION)) .arg(format!("--max-version={}", MAX_VERSION))
.probe("MagickWand") .probe("MagickWand")
.unwrap(); .unwrap();
// We have to split the version check and the cflags/libs check because you can't do both at
// the same time on RHEL (apparently).
let library = pkg_config::Config::new().probe("MagickWand").unwrap();
// If the generated bindings are missing, generate them now. // If the generated bindings are missing, generate them now.
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap()); let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());