blob: 5f8c1c0b691035394f8bef5201ca269b664d82d2 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
MariaDB prefers static libraries, breaks builds with
ports' OpenSSL libs
--- cmake/ssl.cmake.orig 2016-03-24 09:12:10 UTC
+++ cmake/ssl.cmake
@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL)
# On mac this list is <.dylib;.so;.a>
# We prefer static libraries, so we revert it here.
- IF (WITH_SSL_PATH)
- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
- ENDIF()
+# IF (WITH_SSL_PATH)
+# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+# ENDIF()
FIND_LIBRARY(OPENSSL_LIBRARIES
NAMES ssl ssleay32 ssleay32MD
HINTS ${OPENSSL_ROOT_DIR}/lib)
@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL)
HINTS ${OPENSSL_ROOT_DIR}/lib)
MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR
OPENSSL_INCLUDE_DIR)
- IF (WITH_SSL_PATH)
- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
- ENDIF()
+# IF (WITH_SSL_PATH)
+# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+# ENDIF()
INCLUDE(CheckSymbolExists)
SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
|
