Merge pull request #132 from Des-Nerger/master
Add pkg-config as fallback for MagickCore-config
This commit is contained in:
9
build.rs
9
build.rs
@ -123,7 +123,14 @@ fn main() {
|
|||||||
.arg("--cppflags")
|
.arg("--cppflags")
|
||||||
.output()
|
.output()
|
||||||
} else {
|
} else {
|
||||||
Command::new("MagickCore-config").arg("--cppflags").output()
|
Command::new("MagickCore-config")
|
||||||
|
.arg("--cppflags")
|
||||||
|
.output()
|
||||||
|
.or_else(|_| {
|
||||||
|
Command::new("pkg-config")
|
||||||
|
.args(["--cflags", "MagickCore"])
|
||||||
|
.output()
|
||||||
|
})
|
||||||
};
|
};
|
||||||
if let Ok(ok_cppflags) = check_cppflags {
|
if let Ok(ok_cppflags) = check_cppflags {
|
||||||
let cppflags = ok_cppflags.stdout;
|
let cppflags = ok_cppflags.stdout;
|
||||||
|
|||||||
Reference in New Issue
Block a user