From b3faed0f75129e3878d68995d280dfce5dde6edc Mon Sep 17 00:00:00 2001 From: Jim McGrath Date: Sun, 28 May 2017 06:15:47 -0500 Subject: [PATCH] only depend on vcpkg for cfg(target_env = "msvc") --- libsqlite3-sys/Cargo.toml | 2 ++ libsqlite3-sys/build.rs | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libsqlite3-sys/Cargo.toml b/libsqlite3-sys/Cargo.toml index 272cc0c..83b0f08 100644 --- a/libsqlite3-sys/Cargo.toml +++ b/libsqlite3-sys/Cargo.toml @@ -25,4 +25,6 @@ min_sqlite_version_3_7_16 = ["pkg-config", "vcpkg"] bindgen = { version = "0.21", optional = true } pkg-config = { version = "0.3", optional = true } gcc = { version = "0.3", optional = true } + +[target.'cfg(target_env = "msvc")'.build-dependencies] vcpkg = { version = "0.2", optional = true } diff --git a/libsqlite3-sys/build.rs b/libsqlite3-sys/build.rs index b37deaf..67216ee 100644 --- a/libsqlite3-sys/build.rs +++ b/libsqlite3-sys/build.rs @@ -42,7 +42,7 @@ mod build { mod build { extern crate pkg_config; - #[cfg(feature = "vcpkg")] + #[cfg(all(feature = "vcpkg", target_env = "msvc"))] extern crate vcpkg; use std::env; @@ -107,7 +107,7 @@ mod build { } } - #[cfg(feature = "vcpkg")] + #[cfg(all(feature = "vcpkg", target_env = "msvc"))] fn try_vcpkg() -> Option { // See if vcpkg can find it. if let Ok(mut lib) = vcpkg::Config::new().probe("sqlite3") { @@ -119,7 +119,7 @@ mod build { None } - #[cfg(not(feature = "vcpkg"))] + #[cfg(not(all(feature = "vcpkg", target_env = "msvc")))] fn try_vcpkg() -> Option { None }