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.
---
 crypto/CMakeLists.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'crypto')

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 950aa60..0e5d0fc 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -638,16 +638,16 @@ if(NOT HAVE_TIMINGSAFE_MEMCMP)
 	set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c)
 endif()
 
-add_library(crypto-objects OBJECT ${CRYPTO_SRC})
-set_property(TARGET crypto-objects PROPERTY POSITION_INDEPENDENT_CODE 1)
-add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>)
-set(CRYPTO_TARGETS crypto)
-
 if (BUILD_SHARED)
+	add_library(crypto-objects OBJECT ${CRYPTO_SRC})
+	add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>)
 	add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>)
 	set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto)
-	set_target_properties(crypto-shared PROPERTIES VERSION ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION})
-	set(CRYPTO_TARGETS ${CRYPTO_TARGETS} crypto-shared)
+	set_target_properties(crypto-shared PROPERTIES VERSION
+		${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION})
+	install(TARGETS crypto crypto-shared DESTINATION lib)
+else()
+	add_library(crypto STATIC ${CRYPTO_SRC})
+	install(TARGETS crypto DESTINATION lib)
 endif()
 
-install(TARGETS ${CRYPTO_TARGETS} DESTINATION lib)
-- 
cgit v1.2.3-55-g6feb