diff options
author | Brent Cook <bcook@openbsd.org> | 2017-08-12 09:46:19 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2017-08-12 09:46:19 -0500 |
commit | bdec057318a35c1c8152f8dbe84c24e0da7523c4 (patch) | |
tree | 1b7f4fd6836069021d8253e98f3f77b9113651a3 | |
parent | 9be0359cc3b8e0601ad82cb432c534e34cd11862 (diff) | |
parent | 1dd6a52f2d8c1a3e49f330491a123378752a1c0d (diff) | |
download | portable-bdec057318a35c1c8152f8dbe84c24e0da7523c4.tar.gz portable-bdec057318a35c1c8152f8dbe84c24e0da7523c4.tar.bz2 portable-bdec057318a35c1c8152f8dbe84c24e0da7523c4.zip |
Land #332, fix shared library dependencies with cmake for libssl/libtls
-rw-r--r-- | ssl/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tls/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index ed28272..3ea16a8 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt | |||
@@ -51,8 +51,9 @@ if (BUILD_SHARED) | |||
51 | add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>) | 51 | add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>) |
52 | add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>) | 52 | add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>) |
53 | export_symbol(ssl-shared ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) | 53 | export_symbol(ssl-shared ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) |
54 | target_link_libraries(ssl-shared crypto-shared) | ||
54 | if (WIN32) | 55 | if (WIN32) |
55 | target_link_libraries(ssl-shared crypto-shared Ws2_32.lib) | 56 | target_link_libraries(ssl-shared Ws2_32.lib) |
56 | set(SSL_POSTFIX -${SSL_MAJOR_VERSION}) | 57 | set(SSL_POSTFIX -${SSL_MAJOR_VERSION}) |
57 | endif() | 58 | endif() |
58 | set_target_properties(ssl-shared PROPERTIES | 59 | 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 |