summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-01-20 15:48:08 +0100
committerSergei Golubchik <serg@mariadb.org>2022-08-02 17:49:21 +0200
commit28d44abd99a3334d1eba79f378833fc029681f38 (patch)
tree39788b32cd9e89759e6c99b938e897a85c7a6f88 /cmake
parentb043e1098e3575f6e91882ab7b6b254327a2865b (diff)
downloadmariadb-git-28d44abd99a3334d1eba79f378833fc029681f38.tar.gz
MDEV-27540 Different OpenSSL versions mix up in build depending on cmake options
list ${OPENSSL_ROOT_DIR}/lib64 explicitly, because cmake below version 3.23.0 won't search there.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/ssl.cmake3
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)