Skip to content

Commit

Permalink
Install VcPkg/Pkg-Config depending on target env
Browse files Browse the repository at this point in the history
  • Loading branch information
filips123 authored and otavio committed May 4, 2021
1 parent 432121e commit 6eaf5af
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
## [Unreleased] - ReleaseDate

* Bump MSRV to 1.46. [#54]
* Install VcPkg/Pkg-Config depending on target env. [#56]

[#54]: https://github.com/OSSystems/compress-tools-rs/issues/54
[#56]: https://github.com/OSSystems/compress-tools-rs/pull/56

## [0.11.1] - 2021-03-07

Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ argh = "0.1"
async-std = { version = "1.6.3", features = ["attributes"] }
tokio = { version = "1.0.0", features = ["fs", "net"] }

[target.'cfg(target_os = "windows")'.build-dependencies]
[target.'cfg(target_env = "msvc")'.build-dependencies]
vcpkg = "0.2"

[target.'cfg(not(target_os = "windows"))'.build-dependencies]
[target.'cfg(not(target_env = "msvc"))'.build-dependencies]
pkg-config = "0.3"

[[example]]
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ functionalities.
## Dependencies

You must have `libarchive`, 3.2.0 or newer, properly installed on your
system in order to use this. If building on *nix systems, `pkg-config` is
used to locate the `libarchive`; on Windows `vcpkg` will be used to locating
the `libarchive`.
system in order to use this. If building on *nix and Windows GNU
systems, `pkg-config` is used to locate the `libarchive`; on Windows
MSVC, `vcpkg` will be used to locating the `libarchive`.

The minimum supported Rust version is 1.46.

Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
//! # Dependencies
//!
//! You must have `libarchive`, 3.2.0 or newer, properly installed on your
//! system in order to use this. If building on *nix systems, `pkg-config` is
//! used to locate the `libarchive`; on Windows `vcpkg` will be used to locating
//! the `libarchive`.
//! system in order to use this. If building on *nix and Windows GNU
//! systems, `pkg-config` is used to locate the `libarchive`; on Windows
//! MSVC, `vcpkg` will be used to locating the `libarchive`.
//!
//! The minimum supported Rust version is 1.46.
//!
Expand Down

0 comments on commit 6eaf5af

Please sign in to comment.