aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Stancliff <matt@genges.com>2017-01-12 13:41:40 +0800
committerMatt Stancliff <matt@genges.com>2017-01-12 13:46:22 +0800
commit63add73d0b5b49ea583e12610799d2de80877a7d (patch)
tree8050fa02ad107a7909fec0b076eeaa6278ec46ea
parent9f9fdc05314a3a961fb78c9e7fd1c34fa24b5846 (diff)
downloadportable-63add73d0b5b49ea583e12610799d2de80877a7d.tar.gz
portable-63add73d0b5b49ea583e12610799d2de80877a7d.tar.bz2
portable-63add73d0b5b49ea583e12610799d2de80877a7d.zip
Define CMake library object lists globally
OBJECT collections in CMake don't generate any artifacts so these are safe to hoist out and define globally. library OBJECT targets are just a list of filenames. It can be useful for other projects to include lists of sources directly regardless of build mode (shared, static, or library).
-rw-r--r--crypto/CMakeLists.txt2
-rw-r--r--ssl/CMakeLists.txt2
-rw-r--r--tls/CMakeLists.txt2
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\")
750endif() 750endif()
751 751
752add_library(crypto-objects OBJECT ${CRYPTO_SRC})
752if (BUILD_SHARED) 753if (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
51add_library(ssl-objects OBJECT ${SSL_SRC})
51if (BUILD_SHARED) 52if (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\")
30endif() 30endif()
31 31
32add_library(tls-objects OBJECT ${TLS_SRC})
32if (BUILD_SHARED) 33if (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)