diff options
| author | vconcat <77518876+vconcat@users.noreply.github.com> | 2021-03-21 22:21:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-21 15:21:02 +0100 |
| commit | 832b0304ccc61709cc96156c0158a83a340a0df6 (patch) | |
| tree | 0655c3915898885725cd8bb5b6e34ee398edfaa0 /src/cmake | |
| parent | 1d5cc1fb747882401701250863929e9cd389cde4 (diff) | |
feat(Build): allow using MySQL/MariaDB/OpenSSL from vcpkg (#4914)
Diffstat (limited to 'src/cmake')
| -rw-r--r-- | src/cmake/macros/FindMySQL.cmake | 2 | ||||
| -rw-r--r-- | src/cmake/macros/FindOpenSSL.cmake | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/cmake/macros/FindMySQL.cmake b/src/cmake/macros/FindMySQL.cmake index e72fcb08b4..d26d812b30 100644 --- a/src/cmake/macros/FindMySQL.cmake +++ b/src/cmake/macros/FindMySQL.cmake @@ -45,6 +45,7 @@ if (WIN32) ${MYSQL_ADD_INCLUDE_PATH} "${PROGRAM_FILES_64}/${MariaDBVersion}/include/mysql" "${PROGRAM_FILES_32}/${MariaDBVersion}/include/mysql" + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/mysql" DOC "Specify the directory containing mysql.h." ) @@ -64,6 +65,7 @@ if (WIN32) "${PROGRAM_FILES_32}/${MariaDBVersion}/lib/opt" "$ENV{ProgramFiles}/${MariaDBVersion}/lib/opt" "$ENV{SystemDrive}/${MariaDBVersion}/lib/opt" + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" DOC "Specify the location of the mysql library here." ) diff --git a/src/cmake/macros/FindOpenSSL.cmake b/src/cmake/macros/FindOpenSSL.cmake index 877e96d1f9..4d46e5edd6 100644 --- a/src/cmake/macros/FindOpenSSL.cmake +++ b/src/cmake/macros/FindOpenSSL.cmake @@ -29,6 +29,7 @@ SET(_OPENSSL_ROOT_HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]" "$ENV{OPENSSL_ROOT_DIR}" + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" ) IF(PLATFORM EQUAL 64) @@ -89,30 +90,34 @@ IF(WIN32 AND NOT CYGWIN) FIND_LIBRARY(LIB_EAY_DEBUG NAMES - libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MDd libeay32MDd libeay32 + libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MDd libcrypto libeay32MDd libeay32 PATHS ${OPENSSL_ROOT_DIR}/lib/VC + ${OPENSSL_ROOT_DIR}/debug/lib ) FIND_LIBRARY(LIB_EAY_RELEASE NAMES - libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MD libeay32MD libeay32 + libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MD libcrypto libeay32MD libeay32 PATHS ${OPENSSL_ROOT_DIR}/lib/VC + ${OPENSSL_ROOT_DIR}/lib ) FIND_LIBRARY(SSL_EAY_DEBUG NAMES - libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MDd ssleay32MDd ssleay32 ssl + libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MDd libssl ssleay32MDd ssleay32 ssl PATHS ${OPENSSL_ROOT_DIR}/lib/VC + ${OPENSSL_ROOT_DIR}/debug/lib ) FIND_LIBRARY(SSL_EAY_RELEASE NAMES - libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MD ssleay32MD ssleay32 ssl + libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MD libssl ssleay32MD ssleay32 ssl PATHS ${OPENSSL_ROOT_DIR}/lib/VC + ${OPENSSL_ROOT_DIR}/lib ) if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE ) |