aboutsummaryrefslogtreecommitdiff
path: root/tls
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-09-09 05:15:06 -0500
committerBrent Cook <bcook@openbsd.org>2015-09-11 16:36:26 -0500
commit72039968e295bc235a126ad00c2d31df933a9b3d (patch)
treeec1d5cd44d16b315b5b9c3638408be60b9400ab9 /tls
parent9c2f0ef51ce8d0f9210497f3b81b01c073cac3ae (diff)
downloadportable-72039968e295bc235a126ad00c2d31df933a9b3d.tar.gz
portable-72039968e295bc235a126ad00c2d31df933a9b3d.tar.bz2
portable-72039968e295bc235a126ad00c2d31df933a9b3d.zip
Do not build lib-objects targets if we are just building static libs.
This confuses some cmake targets.
Diffstat (limited to 'tls')
-rw-r--r--tls/CMakeLists.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 396780c..68ab3f4 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -19,16 +19,16 @@ if(NOT HAVE_STRCASECMP)
19 set(TLS_SRC ${TLS_SRC} strsep.c) 19 set(TLS_SRC ${TLS_SRC} strsep.c)
20endif() 20endif()
21 21
22add_library(tls-objects OBJECT ${TLS_SRC})
23set_property(TARGET tls-objects PROPERTY POSITION_INDEPENDENT_CODE 1)
24add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>)
25set(TLS_TARGETS tls)
26
27if (BUILD_SHARED) 22if (BUILD_SHARED)
23 add_library(tls-objects OBJECT ${TLS_SRC})
24 add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>)
28 add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) 25 add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>)
29 set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls) 26 set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls)
30 set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} SOVERSION ${TLS_MAJOR_VERSION}) 27 set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION}
31 set(TLS_TARGETS ${TLS_TARGETS} tls-shared) 28 SOVERSION ${TLS_MAJOR_VERSION})
29 install(TARGETS tls tls-shared DESTINATION lib)
30else()
31 add_library(tls STATIC ${TLS_SRC})
32 install(TARGETS tls DESTINATION lib)
32endif() 33endif()
33 34
34install(TARGETS ${TLS_TARGETS} DESTINATION lib)