diff options
| author | Arves100 <arves100@gmail.com> | 2020-10-27 05:00:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 21:00:50 -0700 |
| commit | 5c25a01a9c78abac984fd55d7ad5c8fa5b29041a (patch) | |
| tree | 7ecc40719ae53144453d696ece77acd293c2c1cc | |
| parent | c7db4c3498e751dc0e2503212de49af1df2a3ab1 (diff) | |
| download | vcpkg-5c25a01a9c78abac984fd55d7ad5c8fa5b29041a.tar.gz vcpkg-5c25a01a9c78abac984fd55d7ad5c8fa5b29041a.zip | |
[libmariadb] Fix OpenSSL feature option (#14196)
| -rw-r--r-- | ports/libmariadb/CONTROL | 1 | ||||
| -rw-r--r-- | ports/libmariadb/portfile.cmake | 8 |
2 files changed, 8 insertions, 1 deletions
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()
|