From e9439ff5ca27c4d4ba43b33380f21933f32c61b7 Mon Sep 17 00:00:00 2001 From: Lars Ivar Hatledal Date: Mon, 4 Feb 2019 20:05:42 +0100 Subject: [PATCH] [libzip] Add features to libzip (#5121) * add features to libzip * add documentation * undo add bzip2 as linux build dependency * Use default features, and remove mbedtls feature --- ports/libzip/CONTROL | 7 ++++++- ports/libzip/portfile.cmake | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) 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()