From 5c25a01a9c78abac984fd55d7ad5c8fa5b29041a Mon Sep 17 00:00:00 2001 From: Arves100 Date: Tue, 27 Oct 2020 05:00:50 +0100 Subject: [libmariadb] Fix OpenSSL feature option (#14196) --- ports/libmariadb/CONTROL | 1 + ports/libmariadb/portfile.cmake | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 0021da144..39d0beff5 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -1,5 +1,6 @@ Source: libmariadb Version: 3.1.10 +Port-Version: 1 Homepage: https://github.com/MariaDB/mariadb-connector-c Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases Default-Features: zlib, openssl diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index ccc05c67d..fd009e92a 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -17,10 +17,15 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS zlib WITH_EXTERNAL_ZLIB - openssl WITH_SSL iconv WITH_ICONV ) +if("openssl" IN_LIST FEATURES) + set(WITH_SSL OPENSSL) +else() + set(WITH_SSL OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -28,6 +33,7 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} -DWITH_UNITTEST=OFF -DWITH_CURL=OFF + -DWITH_SSL=${WITH_SSL} ) vcpkg_install_cmake() -- cgit v1.2.3