summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-08-02 10:30:46 +0200
committerSergei Golubchik <serg@mariadb.org>2020-10-23 13:37:26 +0200
commit6cefe7d31ef43cadb905d71be743462825c7b4ff (patch)
tree277c1f5619da87a438b34a248240c25bdf5a1644 /cmake
parent641f81baf45212569ec8a98072d62fd29e3fc8f0 (diff)
downloadmariadb-git-6cefe7d31ef43cadb905d71be743462825c7b4ff.tar.gz
cleanup: use predefined CMAKE_DL_LIBS
instead of, say, MY_SEARCH_LIBS(dlopen dl LIBDL)
Diffstat (limited to 'cmake')
-rw-r--r--cmake/jemalloc.cmake2
-rw-r--r--cmake/ssl.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake
index 5ad636d0e6c..b94a880cf05 100644
--- a/cmake/jemalloc.cmake
+++ b/cmake/jemalloc.cmake
@@ -17,7 +17,7 @@ MACRO (CHECK_JEMALLOC)
IF(WITH_JEMALLOC STREQUAL "static")
SET(libname jemalloc_pic)
- SET(CMAKE_REQUIRED_LIBRARIES pthread dl m)
+ SET(CMAKE_REQUIRED_LIBRARIES pthread ${CMAKE_DL_LIBS} m)
SET(what bundled)
ELSE()
SET(libname jemalloc c)
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
index cc4f0d2daa0..c9562aa4910 100644
--- a/cmake/ssl.cmake
+++ b/cmake/ssl.cmake
@@ -135,7 +135,7 @@ MACRO (MYSQL_CHECK_SSL)
SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBSOCKET})
ENDIF()
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
- SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBDL})
+ SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${CMAKE_DL_LIBS})
ENDIF()
MESSAGE_ONCE(OPENSSL_INCLUDE_DIR "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}")