aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2016-07-31 17:11:19 -0500
committerBrent Cook <bcook@openbsd.org>2016-07-31 17:11:19 -0500
commita7f754a663e5aae795e318d085ea5a28860bbf47 (patch)
treefa004a3667577bcf7066650559cf4166d1a7dcce
parent1fde1eaa44153cf57de74dbe7e12d17c015863dc (diff)
downloadportable-a7f754a663e5aae795e318d085ea5a28860bbf47.tar.gz
portable-a7f754a663e5aae795e318d085ea5a28860bbf47.tar.bz2
portable-a7f754a663e5aae795e318d085ea5a28860bbf47.zip
set link library dependencies with MSVC, fixes #221
-rw-r--r--crypto/CMakeLists.txt3
-rw-r--r--ssl/CMakeLists.txt3
-rw-r--r--tls/CMakeLists.txt3
3 files changed, 9 insertions, 0 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 2eca0b9..0349e73 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -752,6 +752,9 @@ if (BUILD_SHARED)
752 add_library(crypto-objects OBJECT ${CRYPTO_SRC}) 752 add_library(crypto-objects OBJECT ${CRYPTO_SRC})
753 add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>) 753 add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>)
754 add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>) 754 add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>)
755 if (MSVC)
756 target_link_libraries(crypto-shared crypto Ws2_32.lib)
757 endif()
755 set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto) 758 set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto)
756 set_target_properties(crypto-shared PROPERTIES VERSION 759 set_target_properties(crypto-shared PROPERTIES VERSION
757 ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION}) 760 ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION})
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 90acd33..e836047 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -52,6 +52,9 @@ if (BUILD_SHARED)
52 add_library(ssl-objects OBJECT ${SSL_SRC}) 52 add_library(ssl-objects OBJECT ${SSL_SRC})
53 add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>) 53 add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>)
54 add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>) 54 add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>)
55 if (MSVC)
56 target_link_libraries(ssl-shared crypto-shared Ws2_32.lib)
57 endif()
55 set_target_properties(ssl-shared PROPERTIES OUTPUT_NAME ssl) 58 set_target_properties(ssl-shared PROPERTIES OUTPUT_NAME ssl)
56 set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION} 59 set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION}
57 SOVERSION ${SSL_MAJOR_VERSION}) 60 SOVERSION ${SSL_MAJOR_VERSION})
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 53c8be7..b8549a6 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -31,6 +31,9 @@ if (BUILD_SHARED)
31 add_library(tls-objects OBJECT ${TLS_SRC}) 31 add_library(tls-objects OBJECT ${TLS_SRC})
32 add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) 32 add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>)
33 add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) 33 add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>)
34 if (MSVC)
35 target_link_libraries(tls-shared ssl-shared crypto-shared Ws2_32.lib)
36 endif()
34 set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls) 37 set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls)
35 set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} 38 set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION}
36 SOVERSION ${TLS_MAJOR_VERSION}) 39 SOVERSION ${TLS_MAJOR_VERSION})