Skip to content

Commit e0ed51c

Browse files
daverigbytrondn
authored andcommitted
MB-11202: Use SecureTransport for SSL on OS X
As libcurl has been updated to use the native SSL library (see http://review.couchbase.org/#/c/37653/), update moxi (which also uses libcurl) to link against the relevent library depending on platform. Change-Id: I4109b55768b11333bfd3e122463caaab4f95ba86 Reviewed-on: http://review.couchbase.org/37721 Reviewed-by: Trond Norbye <[email protected]> Tested-by: Trond Norbye <[email protected]>
1 parent fd96277 commit e0ed51c

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

CMakeLists.txt

+9-1
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,16 @@ ELSE(WIN32)
3535
SET(ZLIB z)
3636
ENDIF(WIN32)
3737

38+
IF(APPLE)
39+
FIND_LIBRARY(SECURITY NAMES Security)
40+
FIND_LIBRARY(CORE_FOUNDATION NAMES CoreFoundation)
41+
SET(SSL_LIBRARIES ${SECURITY} ${CORE_FOUNDATION})
42+
ELSE(APPLE)
43+
SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES})
44+
ENDIF(APPLE)
45+
3846
TARGET_LINK_LIBRARIES(conflate ${CURL_LIBRARIES} platform ${ZLIB}
39-
${OPENSSL_LIBRARIES})
47+
${SSL_LIBRARIES})
4048
SET_TARGET_PROPERTIES(conflate PROPERTIES SOVERSION 1.0.0)
4149
SET_TARGET_PROPERTIES(conflate PROPERTIES COMPILE_FLAGS
4250
-DBUILDING_LIBCONFLATE=1)

0 commit comments

Comments
 (0)