diff options
author | Brent Cook <bcook@openbsd.org> | 2016-07-31 17:11:19 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2016-07-31 17:12:47 -0500 |
commit | 926aa53242e00ae363fb871ea010bf2137432697 (patch) | |
tree | 69b1f58d74cc94f8c4d640ea3cb13079c432bd43 | |
parent | 950dcb2d07ac7bcc0964d3e8dff2cbb9441ba60e (diff) | |
download | portable-926aa53242e00ae363fb871ea010bf2137432697.tar.gz portable-926aa53242e00ae363fb871ea010bf2137432697.tar.bz2 portable-926aa53242e00ae363fb871ea010bf2137432697.zip |
set link library dependencies with MSVC, fixes #221
-rw-r--r-- | crypto/CMakeLists.txt | 3 | ||||
-rw-r--r-- | ssl/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tls/CMakeLists.txt | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 0e44da7..124395b 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -641,6 +641,9 @@ if (BUILD_SHARED) | |||
641 | add_library(crypto-objects OBJECT ${CRYPTO_SRC}) | 641 | add_library(crypto-objects OBJECT ${CRYPTO_SRC}) |
642 | add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>) | 642 | add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>) |
643 | add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>) | 643 | add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>) |
644 | if (MSVC) | ||
645 | target_link_libraries(crypto-shared crypto Ws2_32.lib) | ||
646 | endif() | ||
644 | set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto) | 647 | set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto) |
645 | set_target_properties(crypto-shared PROPERTIES VERSION | 648 | set_target_properties(crypto-shared PROPERTIES VERSION |
646 | ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION}) | 649 | ${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 ad6fe49..d8d8bcc 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt | |||
@@ -25,6 +25,9 @@ if (BUILD_SHARED) | |||
25 | add_library(tls-objects OBJECT ${TLS_SRC}) | 25 | add_library(tls-objects OBJECT ${TLS_SRC}) |
26 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) | 26 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) |
27 | add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) | 27 | add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) |
28 | if (MSVC) | ||
29 | target_link_libraries(tls-shared ssl-shared crypto-shared Ws2_32.lib) | ||
30 | endif() | ||
28 | set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls) | 31 | set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls) |
29 | set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} | 32 | set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} |
30 | SOVERSION ${TLS_MAJOR_VERSION}) | 33 | SOVERSION ${TLS_MAJOR_VERSION}) |