sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(Build): allow using MySQL/MariaDB/OpenSSL from vcpkg (#4914)

Browse Source
This commit is contained in:
vconcat
2021-03-21 22:21:02 +08:00
committed by GitHub
parent 1d5cc1fb74
commit 832b0304cc
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmake/macros/FindMySQL.cmake
+2
View File
@@ -45,6 +45,7 @@ if (WIN32)
${MYSQL_ADD_INCLUDE_PATH} ${MYSQL_ADD_INCLUDE_PATH}
"${PROGRAM_FILES_64}/${MariaDBVersion}/include/mysql" "${PROGRAM_FILES_64}/${MariaDBVersion}/include/mysql"
"${PROGRAM_FILES_32}/${MariaDBVersion}/include/mysql" "${PROGRAM_FILES_32}/${MariaDBVersion}/include/mysql"
"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/mysql"
DOC DOC
"Specify the directory containing mysql.h." "Specify the directory containing mysql.h."
) )
@@ -64,6 +65,7 @@ if (WIN32)
"${PROGRAM_FILES_32}/${MariaDBVersion}/lib/opt" "${PROGRAM_FILES_32}/${MariaDBVersion}/lib/opt"
"$ENV{ProgramFiles}/${MariaDBVersion}/lib/opt" "$ENV{ProgramFiles}/${MariaDBVersion}/lib/opt"
"$ENV{SystemDrive}/${MariaDBVersion}/lib/opt" "$ENV{SystemDrive}/${MariaDBVersion}/lib/opt"
"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib"
DOC DOC
"Specify the location of the mysql library here." "Specify the location of the mysql library here."
) )
src/cmake/macros/FindOpenSSL.cmake
+9 -4
View File
@@ -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 (32-bit)_is1;Inno Setup: App Path]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-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}" "$ENV{OPENSSL_ROOT_DIR}"
"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}"
) )
IF(PLATFORM EQUAL 64) IF(PLATFORM EQUAL 64)
@@ -89,30 +90,34 @@ IF(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(LIB_EAY_DEBUG FIND_LIBRARY(LIB_EAY_DEBUG
NAMES NAMES
libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MDd libeay32MDd libeay32 libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MDd libcrypto libeay32MDd libeay32
PATHS PATHS
${OPENSSL_ROOT_DIR}/lib/VC ${OPENSSL_ROOT_DIR}/lib/VC
${OPENSSL_ROOT_DIR}/debug/lib
) )
FIND_LIBRARY(LIB_EAY_RELEASE FIND_LIBRARY(LIB_EAY_RELEASE
NAMES NAMES
libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MD libeay32MD libeay32 libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MD libcrypto libeay32MD libeay32
PATHS PATHS
${OPENSSL_ROOT_DIR}/lib/VC ${OPENSSL_ROOT_DIR}/lib/VC
${OPENSSL_ROOT_DIR}/lib
) )
FIND_LIBRARY(SSL_EAY_DEBUG FIND_LIBRARY(SSL_EAY_DEBUG
NAMES NAMES
libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MDd ssleay32MDd ssleay32 ssl libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MDd libssl ssleay32MDd ssleay32 ssl
PATHS PATHS
${OPENSSL_ROOT_DIR}/lib/VC ${OPENSSL_ROOT_DIR}/lib/VC
${OPENSSL_ROOT_DIR}/debug/lib
) )
FIND_LIBRARY(SSL_EAY_RELEASE FIND_LIBRARY(SSL_EAY_RELEASE
NAMES NAMES
libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MD ssleay32MD ssleay32 ssl libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MD libssl ssleay32MD ssleay32 ssl
PATHS PATHS
${OPENSSL_ROOT_DIR}/lib/VC ${OPENSSL_ROOT_DIR}/lib/VC
${OPENSSL_ROOT_DIR}/lib
) )
if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE ) if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )