From adfb2bf72257c4d622f4be8f897c5ddafa4e58ae Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
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.
---
 ssl/CMakeLists.txt | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'ssl')

diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 7d1140e..5d8dd5e 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -50,16 +50,15 @@ set(
 	t1_srvr.c
 )
 
-add_library(ssl-objects OBJECT ${SSL_SRC})
-set_property(TARGET ssl-objects PROPERTY POSITION_INDEPENDENT_CODE 1)
-add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>)
-set(SSL_TARGETS ssl)
-
 if (BUILD_SHARED)
+	add_library(ssl-objects OBJECT ${SSL_SRC})
+	add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>)
 	add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>)
 	set_target_properties(ssl-shared PROPERTIES OUTPUT_NAME ssl)
-	set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION} SOVERSION ${SSL_MAJOR_VERSION})
-	set(SSL_TARGETS ${SSL_TARGETS} ssl-shared)
+	set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION}
+		SOVERSION ${SSL_MAJOR_VERSION})
+	install(TARGETS ssl ssl-shared DESTINATION lib)
+else()
+	add_library(ssl STATIC ${SSL_SRC})
+	install(TARGETS ssl DESTINATION lib)
 endif()
-
-install(TARGETS ${SSL_TARGETS} DESTINATION lib)
-- 
cgit v1.2.3-55-g6feb