diff options
author | Brent Cook <bcook@openbsd.org> | 2017-01-13 08:15:26 -0600 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2017-01-13 08:15:26 -0600 |
commit | 6db42999415c48d96d2498a6ac51cd233a308fd2 (patch) | |
tree | 857f0b26539726542ef28496a1d9a5fc2f661592 | |
parent | 5e6c9983dd5a96e28bcf02a123b3db6182b807dc (diff) | |
parent | 63add73d0b5b49ea583e12610799d2de80877a7d (diff) | |
download | portable-6db42999415c48d96d2498a6ac51cd233a308fd2.tar.gz portable-6db42999415c48d96d2498a6ac51cd233a308fd2.tar.bz2 portable-6db42999415c48d96d2498a6ac51cd233a308fd2.zip |
Land #256, Define CMake library object lists globally
Diffstat (limited to '')
-rw-r--r-- | crypto/CMakeLists.txt | 2 | ||||
-rw-r--r-- | ssl/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tls/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 2b48d32..dd0e569 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -749,8 +749,8 @@ else() | |||
749 | add_definitions(-DOPENSSLDIR=\"${CMAKE_INSTALL_PREFIX}/etc/ssl\") | 749 | add_definitions(-DOPENSSLDIR=\"${CMAKE_INSTALL_PREFIX}/etc/ssl\") |
750 | endif() | 750 | endif() |
751 | 751 | ||
752 | add_library(crypto-objects OBJECT ${CRYPTO_SRC}) | ||
752 | if (BUILD_SHARED) | 753 | if (BUILD_SHARED) |
753 | add_library(crypto-objects OBJECT ${CRYPTO_SRC}) | ||
754 | add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>) | 754 | add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>) |
755 | add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>) | 755 | add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>) |
756 | if (WIN32) | 756 | if (WIN32) |
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index 5866e8e..d511c8e 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt | |||
@@ -48,8 +48,8 @@ set( | |||
48 | t1_srvr.c | 48 | t1_srvr.c |
49 | ) | 49 | ) |
50 | 50 | ||
51 | add_library(ssl-objects OBJECT ${SSL_SRC}) | ||
51 | if (BUILD_SHARED) | 52 | if (BUILD_SHARED) |
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 (WIN32) | 55 | if (WIN32) |
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index e384808..1f78038 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt | |||
@@ -29,8 +29,8 @@ else() | |||
29 | add_definitions(-D_PATH_SSL_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") | 29 | add_definitions(-D_PATH_SSL_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") |
30 | endif() | 30 | endif() |
31 | 31 | ||
32 | add_library(tls-objects OBJECT ${TLS_SRC}) | ||
32 | if (BUILD_SHARED) | 33 | if (BUILD_SHARED) |
33 | add_library(tls-objects OBJECT ${TLS_SRC}) | ||
34 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) | 34 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) |
35 | add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) | 35 | add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) |
36 | if (WIN32) | 36 | if (WIN32) |