rebased for CI

This commit is contained in:
Jack OntheGoMac 2021-12-22 10:31:11 -08:00 committed by Ruifeng Xie
parent f10cecf803
commit 5354ba8b04
No known key found for this signature in database
GPG Key ID: 17A512702D99B3B8

View File

@ -9,30 +9,31 @@ const DEFINES: &[(&str, Option<&str>)] = &[
("IMGUI_DISABLE_OSX_FUNCTIONS", None),
];
#[cfg(feature = "freetype")]
fn find_freetype() -> Vec<impl AsRef<std::path::Path>> {
let err_pkg_config;
let err_vcpkg;
match pkg_config::Config::new().find("freetype2") {
Ok(freetype) => return freetype.include_paths,
Err(err) => err_pkg_config = err,
}
match vcpkg::find_package("freetype") {
Ok(freetype) => return freetype.include_paths,
Err(err) => err_vcpkg = err,
}
panic!(
"cannot find freetype:\n\
- pkg-config failed with: {}\n\
- vcpkg failed with: {}",
err_pkg_config, err_vcpkg
);
}
// Output define args for compiler
fn main() -> std::io::Result<()> {
// Root of imgui-sys
let manifest_dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR"));
#[cfg(feature = "freetype")]
fn find_freetype() -> Vec<impl AsRef<std::path::Path>> {
let err_pkg_config;
let err_vcpkg;
match pkg_config::Config::new().find("freetype2") {
Ok(freetype) => return freetype.include_paths,
Err(err) => err_pkg_config = err,
}
match vcpkg::find_package("freetype") {
Ok(freetype) => return freetype.include_paths,
Err(err) => err_vcpkg = err,
}
panic!(
"cannot find freetype:\n\
- pkg-config failed with: {}\n\
- vcpkg failed with: {}",
err_pkg_config, err_vcpkg
);
}
println!(
"cargo:THIRD_PARTY={}",
manifest_dir.join("third-party").display()