aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasud Rahman <mrahman15@bloomberg.net>2017-07-24 15:24:29 -0400
committerMasud Rahman <mrahman15@bloomberg.net>2017-07-24 15:26:29 -0400
commit1dd6a52f2d8c1a3e49f330491a123378752a1c0d (patch)
tree6465d0fad1687507f59c332b07207d038fa11b96
parent5ec2c381e4ac48e588a093be5faf04919523da32 (diff)
downloadportable-1dd6a52f2d8c1a3e49f330491a123378752a1c0d.tar.gz
portable-1dd6a52f2d8c1a3e49f330491a123378752a1c0d.tar.bz2
portable-1dd6a52f2d8c1a3e49f330491a123378752a1c0d.zip
ssl/tls cmake: fix shared library dependencies
Ensure that the 'ssl' depends on 'crypto' and that 'tls' depends on 'ssl' and 'crypto' for all platforms. Prior to this commit, the dependency was only specified for the 'WIN32' CMake build.
-rw-r--r--ssl/CMakeLists.txt3
-rw-r--r--tls/CMakeLists.txt3
2 files changed, 4 insertions, 2 deletions
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 12005c9..644ee00 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -52,8 +52,9 @@ if (BUILD_SHARED)
52 add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>) 52 add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>)
53 add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>) 53 add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>)
54 export_symbol(ssl-shared ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) 54 export_symbol(ssl-shared ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
55 target_link_libraries(ssl-shared crypto-shared)
55 if (WIN32) 56 if (WIN32)
56 target_link_libraries(ssl-shared crypto-shared Ws2_32.lib) 57 target_link_libraries(ssl-shared Ws2_32.lib)
57 set(SSL_POSTFIX -${SSL_MAJOR_VERSION}) 58 set(SSL_POSTFIX -${SSL_MAJOR_VERSION})
58 endif() 59 endif()
59 set_target_properties(ssl-shared PROPERTIES 60 set_target_properties(ssl-shared PROPERTIES
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index c8de04c..fbe6693 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -30,8 +30,9 @@ if (BUILD_SHARED)
30 add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) 30 add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>)
31 add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) 31 add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>)
32 export_symbol(tls-shared ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym) 32 export_symbol(tls-shared ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym)
33 target_link_libraries(tls-shared ssl-shared crypto-shared)
33 if (WIN32) 34 if (WIN32)
34 target_link_libraries(tls-shared ssl-shared crypto-shared Ws2_32.lib) 35 target_link_libraries(tls-shared Ws2_32.lib)
35 set(TLS_POSTFIX -${TLS_MAJOR_VERSION}) 36 set(TLS_POSTFIX -${TLS_MAJOR_VERSION})
36 endif() 37 endif()
37 set_target_properties(tls-shared PROPERTIES 38 set_target_properties(tls-shared PROPERTIES