aboutsummaryrefslogtreecommitdiff
path: root/ports/libzip
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2019-02-28 14:36:23 -0800
committerPhil Christensen <philc@microsoft.com>2019-02-28 14:36:23 -0800
commit773c8267dfb506f41c204f61042f30b6143a8095 (patch)
tree5946d1526c3ad77a2df80786a1370d96389d931b /ports/libzip
parent6afbceb27fd2aa39c66f810a22f5d4ad97575110 (diff)
parent7859944528be28bee1fda9f325b78d6a7f02124e (diff)
downloadvcpkg-773c8267dfb506f41c204f61042f30b6143a8095.tar.gz
vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.zip
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4564
Diffstat (limited to 'ports/libzip')
-rw-r--r--ports/libzip/CONTROL7
-rw-r--r--ports/libzip/portfile.cmake9
2 files changed, 15 insertions, 1 deletions
diff --git a/ports/libzip/CONTROL b/ports/libzip/CONTROL
index 52681ed04..c318303dc 100644
--- a/ports/libzip/CONTROL
+++ b/ports/libzip/CONTROL
@@ -1,4 +1,9 @@
Source: libzip
-Version: rel-1-5-1-vcpkg1
+Version: rel-1-5-1-vcpkg2
Build-Depends: zlib
+Default-Features: openssl
Description: A library for reading, creating, and modifying zip archives.
+
+Feature: openssl
+Build-Depends: openssl
+Description: AES (encryption) support using OpenSSL
diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake
index de7940b3a..c4dee7221 100644
--- a/ports/libzip/portfile.cmake
+++ b/ports/libzip/portfile.cmake
@@ -8,9 +8,18 @@ vcpkg_from_github(
PATCHES cmake_dont_build_more_than_needed.patch
)
+# AES encryption
+set(USE_OPENSSL OFF)
+if("openssl" IN_LIST FEATURES)
+ set(USE_OPENSSL ON)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ OPTIONS
+ # see https://github.com/nih-at/libzip/blob/rel-1-5-1/INSTALL.md
+ -DENABLE_OPENSSL=${USE_OPENSSL}
)
vcpkg_install_cmake()