mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 01:59:01 +08:00
3492464c1c
* Update to 3.1.15 * Modernize portfile * Keep plugins * Always use vcpkg zlib instead vendored copy * Use zlib and openssl modules in pc file * Always install pc file, drop non-relocatable mariadb_config * UWP is not supported * Use schannel SSL backend on windows * Fix exported includedir and libdir * Fixup windows pc file * Disable extra static lib * Disable plugins with extra dependencies * [libmariadb] Namespace targets with unofficial:: * Update versions * Enable CI for x86-windows: no conflict with mysql * Re-enable lib mariadbclient via feature * Use openssl targets to handle multi-config * Update versions * CR request * Update versions
14 lines
554 B
Diff
14 lines
554 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 33565f5..d83176d 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -280,7 +280,7 @@ IF(NOT WITH_SSL STREQUAL "OFF")
|
|
IF(OPENSSL_FOUND)
|
|
ADD_DEFINITIONS(-DHAVE_OPENSSL -DHAVE_TLS)
|
|
SET(SSL_SOURCES "${CC_SOURCE_DIR}/libmariadb/secure/openssl.c")
|
|
- SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
|
|
+ SET(SSL_LIBRARIES OpenSSL::SSL)
|
|
IF(WIN32)
|
|
CHECK_INCLUDE_FILES (${OPENSSL_INCLUDE_DIR}/openssl/applink.c HAVE_OPENSSL_APPLINK_C)
|
|
ENDIF()
|