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

Merge pull request #78 from liyunde/master

Browse Source 
fix path_separator on windows can not build
This commit is contained in:
Nathan Fiedler
2021-03-11 13:48:03 -08:00
committed by GitHub
parent 82778e69f5 480421aa65
commit 348dd1fd21
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
build.rs
View File

@ -28,6 +28,12 @@ const MAX_VERSION: &'static str = "7.1";
static HEADER: &'static str = "#include <MagickWand/MagickWand.h>\n"; static HEADER: &'static str = "#include <MagickWand/MagickWand.h>\n";
//on windows path env always contain : like c:
pub const PATH_SEPARATOR: &str = match cfg!(target_os = "windows") {
true => ";",
_ => ":",
};
fn main() { fn main() {
if cfg!(target_os = "freebsd") { if cfg!(target_os = "freebsd") {
// pkg_config does not seem to work properly on FreeBSD, so // pkg_config does not seem to work properly on FreeBSD, so
@ -41,14 +47,14 @@ fn main() {
env_var_set_default("IMAGE_MAGICK_LIBS", "MagickWand-7"); env_var_set_default("IMAGE_MAGICK_LIBS", "MagickWand-7");
} }
let cppflags = Command::new("MagickCore-config") let check_cppflags = Command::new("MagickCore-config").arg("--cppflags").output();
.arg("--cppflags") //on windows can not exec
.output() if check_cppflags.is_ok() {
.unwrap() let cppflags = check_cppflags.unwrap().stdout;
.stdout;
let cppflags = String::from_utf8(cppflags).unwrap(); let cppflags = String::from_utf8(cppflags).unwrap();
env_var_set_default("BINDGEN_EXTRA_CLANG_ARGS", &cppflags); env_var_set_default("BINDGEN_EXTRA_CLANG_ARGS", &cppflags);
}
let lib_dirs = find_image_magick_lib_dirs(); let lib_dirs = find_image_magick_lib_dirs();
for d in &lib_dirs { for d in &lib_dirs {
@ -75,7 +81,7 @@ fn main() {
let target = env::var("TARGET").unwrap(); let target = env::var("TARGET").unwrap();
let libs_env = env::var("IMAGE_MAGICK_LIBS").ok(); let libs_env = env::var("IMAGE_MAGICK_LIBS").ok();
let libs = match libs_env { let libs = match libs_env {
Some(ref v) => v.split(":").map(|x| x.to_owned()).collect(), Some(ref v) => v.split(PATH_SEPARATOR).map(|x| x.to_owned()).collect(),
None => { None => {
if target.contains("windows") { if target.contains("windows") {
vec!["CORE_RL_MagickWand_".to_string()] vec!["CORE_RL_MagickWand_".to_string()]
@ -172,7 +178,11 @@ fn env_var_set_default(name: &str, value: &str) {
fn find_image_magick_lib_dirs() -> Vec<PathBuf> { fn find_image_magick_lib_dirs() -> Vec<PathBuf> {
println!("cargo:rerun-if-env-changed=IMAGE_MAGICK_LIB_DIRS"); println!("cargo:rerun-if-env-changed=IMAGE_MAGICK_LIB_DIRS");
env::var("IMAGE_MAGICK_LIB_DIRS") env::var("IMAGE_MAGICK_LIB_DIRS")
.map(|x| x.split(":").map(PathBuf::from).collect::<Vec<PathBuf>>()) .map(|x| {
x.split(PATH_SEPARATOR)
.map(PathBuf::from)
.collect::<Vec<PathBuf>>()
})
.or_else(|_| Ok(vec![find_image_magick_dir()?.join("lib")])) .or_else(|_| Ok(vec![find_image_magick_dir()?.join("lib")]))
.or_else(|_: env::VarError| -> Result<_, env::VarError> { Ok(run_pkg_config().link_paths) }) .or_else(|_: env::VarError| -> Result<_, env::VarError> { Ok(run_pkg_config().link_paths) })
.expect("Couldn't find ImageMagick library directory") .expect("Couldn't find ImageMagick library directory")
@ -181,7 +191,11 @@ fn find_image_magick_lib_dirs() -> Vec<PathBuf> {
fn find_image_magick_include_dirs() -> Vec<PathBuf> { fn find_image_magick_include_dirs() -> Vec<PathBuf> {
println!("cargo:rerun-if-env-changed=IMAGE_MAGICK_INCLUDE_DIRS"); println!("cargo:rerun-if-env-changed=IMAGE_MAGICK_INCLUDE_DIRS");
env::var("IMAGE_MAGICK_INCLUDE_DIRS") env::var("IMAGE_MAGICK_INCLUDE_DIRS")
.map(|x| x.split(":").map(PathBuf::from).collect::<Vec<PathBuf>>()) .map(|x| {
x.split(PATH_SEPARATOR)
.map(PathBuf::from)
.collect::<Vec<PathBuf>>()
})
.or_else(|_| Ok(vec![find_image_magick_dir()?.join("include")])) .or_else(|_| Ok(vec![find_image_magick_dir()?.join("include")]))
.or_else(|_: env::VarError| -> Result<_, env::VarError> { .or_else(|_: env::VarError| -> Result<_, env::VarError> {
Ok(run_pkg_config().include_paths) Ok(run_pkg_config().include_paths)