diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-01-20 15:48:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-01-20 16:01:10 +0100 |
| commit | baef53a70c675da6d19ac3c7f23c7b8b4ed8458c (patch) | |
| tree | ee21448c30b20c9ccec6a7ac8fe0512e823881f1 /cmake/ssl.cmake | |
| parent | d42c2efbaa06a0307c2f0fd8fa87819ff50bbd7e (diff) | |
| download | mariadb-git-baef53a70c675da6d19ac3c7f23c7b8b4ed8458c.tar.gz | |
MDEV-27540 Different OpenSSL versions mix up in build depending on cmake optionspreview-10.8-MDEV-25785-openssl3.0
list ${OPENSSL_ROOT_DIR}/lib64 explicitly, because
cmake below version 3.23.0 won't search there.
Diffstat (limited to 'cmake/ssl.cmake')
| -rw-r--r-- | cmake/ssl.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 1bd46bc0f39..646aa37a91c 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -113,7 +113,8 @@ MACRO (MYSQL_CHECK_SSL) ) IF(NOT OPENSSL_ROOT_DIR) 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() FIND_PACKAGE(OpenSSL) |