From adfb2bf72257c4d622f4be8f897c5ddafa4e58ae Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Wed, 9 Sep 2015 05:15:06 -0500 Subject: Do not build lib-objects targets if we are just building static libs. This confuses some cmake targets. --- tls/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tls') 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) set(TLS_SRC ${TLS_SRC} strsep.c) endif() -add_library(tls-objects OBJECT ${TLS_SRC}) -set_property(TARGET tls-objects PROPERTY POSITION_INDEPENDENT_CODE 1) -add_library(tls STATIC $) -set(TLS_TARGETS tls) - if (BUILD_SHARED) + add_library(tls-objects OBJECT ${TLS_SRC}) + add_library(tls STATIC $) add_library(tls-shared SHARED $) set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls) - set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} SOVERSION ${TLS_MAJOR_VERSION}) - set(TLS_TARGETS ${TLS_TARGETS} tls-shared) + set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} + SOVERSION ${TLS_MAJOR_VERSION}) + install(TARGETS tls tls-shared DESTINATION lib) +else() + add_library(tls STATIC ${TLS_SRC}) + install(TARGETS tls DESTINATION lib) endif() -install(TARGETS ${TLS_TARGETS} DESTINATION lib) -- cgit v1.2.3-55-g6feb