Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions zng/cmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ pub fn build_zlib_ng(target: &str, compat: bool) {
cmake.define("CMAKE_GENERATOR_PLATFORM", "Win32");
}

// libz-ng uses the GNUInstallDirs convention, so we can use the following
// to ensure libraries are placed in a consistent place in the
// installation dir.
cmake.define("CMAKE_INSTALL_LIBDIR", "lib");

let install_dir = cmake.build();

let includedir = install_dir.join("include");
let libdir = install_dir.join("lib");
let libdir64 = install_dir.join("lib64");
println!(
"cargo:rustc-link-search=native={}",
libdir.to_str().unwrap()
);
println!(
"cargo:rustc-link-search=native={}",
libdir64.to_str().unwrap()
);
let mut debug_suffix = "";
let libname = if target.contains("windows") && target.contains("msvc") {
if env::var("OPT_LEVEL").unwrap() == "0" {
Expand Down
Loading