database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-27540 Different OpenSSL versions mix up in build depending on cmake options

Browse Source 
list ${OPENSSL_ROOT_DIR}/lib64 explicitly, because
cmake below version 3.23.0 won't search there.
This commit is contained in:
Sergei Golubchik
2022-01-20 15:48:08 +01:00
parent d42c2efbaa
commit baef53a70c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/ssl.cmake
View File

@@ -113,7 +113,8 @@ MACRO (MYSQL_CHECK_SSL)
) )
IF(NOT OPENSSL_ROOT_DIR) IF(NOT OPENSSL_ROOT_DIR)
IF(WITH_SSL_PATH) IF(WITH_SSL_PATH)
SET(OPENSSL_ROOT_DIR ${WITH_SSL_PATH}) # workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/22945
SET(OPENSSL_ROOT_DIR ${WITH_SSL_PATH} ${WITH_SSL_PATH}/lib64)
ENDIF() ENDIF()
ENDIF() ENDIF()
FIND_PACKAGE(OpenSSL) FIND_PACKAGE(OpenSSL)