aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-09-07 01:05:33 -0500
committerBrent Cook <bcook@openbsd.org>2015-09-07 01:05:33 -0500
commitca56c332e3356118441c955e690f6727a9928b69 (patch)
tree4df1dc6d552b44dea1cca3d94c0c4a30d66c8218
parent4078416c36124e86275b093519f7c0d772ee25b8 (diff)
downloadportable-ca56c332e3356118441c955e690f6727a9928b69.tar.gz
portable-ca56c332e3356118441c955e690f6727a9928b69.tar.bz2
portable-ca56c332e3356118441c955e690f6727a9928b69.zip
disable shared CMake builds for OS X / Windows for now
-rw-r--r--CMakeLists.txt4
-rw-r--r--crypto/CMakeLists.txt12
-rw-r--r--ssl/CMakeLists.txt13
-rw-r--r--tls/CMakeLists.txt13
4 files changed, 30 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5c5408..0e4c000 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,6 +158,10 @@ if(CMAKE_HOST_WIN32)
158 set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) 158 set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32)
159endif() 159endif()
160 160
161if(NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin" OR MSVC))
162 set(BUILD_SHARED true)
163endif()
164
161add_subdirectory(crypto) 165add_subdirectory(crypto)
162add_subdirectory(ssl) 166add_subdirectory(ssl)
163add_subdirectory(apps) 167add_subdirectory(apps)
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index fabf479..950aa60 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -641,9 +641,13 @@ endif()
641add_library(crypto-objects OBJECT ${CRYPTO_SRC}) 641add_library(crypto-objects OBJECT ${CRYPTO_SRC})
642set_property(TARGET crypto-objects PROPERTY POSITION_INDEPENDENT_CODE 1) 642set_property(TARGET crypto-objects PROPERTY POSITION_INDEPENDENT_CODE 1)
643add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>) 643add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>)
644add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>) 644set(CRYPTO_TARGETS crypto)
645set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto)
646set_target_properties(crypto-shared PROPERTIES VERSION ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION})
647install(TARGETS crypto crypto-shared DESTINATION lib)
648 645
646if (BUILD_SHARED)
647 add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>)
648 set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto)
649 set_target_properties(crypto-shared PROPERTIES VERSION ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION})
650 set(CRYPTO_TARGETS ${CRYPTO_TARGETS} crypto-shared)
651endif()
649 652
653install(TARGETS ${CRYPTO_TARGETS} DESTINATION lib)
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index f227213..7d1140e 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -53,8 +53,13 @@ set(
53add_library(ssl-objects OBJECT ${SSL_SRC}) 53add_library(ssl-objects OBJECT ${SSL_SRC})
54set_property(TARGET ssl-objects PROPERTY POSITION_INDEPENDENT_CODE 1) 54set_property(TARGET ssl-objects PROPERTY POSITION_INDEPENDENT_CODE 1)
55add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>) 55add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>)
56add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>) 56set(SSL_TARGETS ssl)
57set_target_properties(ssl-shared PROPERTIES OUTPUT_NAME ssl)
58set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION} SOVERSION ${SSL_MAJOR_VERSION})
59 57
60install(TARGETS ssl ssl-shared DESTINATION lib) 58if (BUILD_SHARED)
59 add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>)
60 set_target_properties(ssl-shared PROPERTIES OUTPUT_NAME ssl)
61 set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION} SOVERSION ${SSL_MAJOR_VERSION})
62 set(SSL_TARGETS ${SSL_TARGETS} ssl-shared)
63endif()
64
65install(TARGETS ${SSL_TARGETS} DESTINATION lib)
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 7c8cf21..396780c 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -22,8 +22,13 @@ endif()
22add_library(tls-objects OBJECT ${TLS_SRC}) 22add_library(tls-objects OBJECT ${TLS_SRC})
23set_property(TARGET tls-objects PROPERTY POSITION_INDEPENDENT_CODE 1) 23set_property(TARGET tls-objects PROPERTY POSITION_INDEPENDENT_CODE 1)
24add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) 24add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>)
25add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) 25set(TLS_TARGETS tls)
26set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls)
27set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} SOVERSION ${TLS_MAJOR_VERSION})
28 26
29install(TARGETS tls tls-shared DESTINATION lib) 27if (BUILD_SHARED)
28 add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>)
29 set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls)
30 set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} SOVERSION ${TLS_MAJOR_VERSION})
31 set(TLS_TARGETS ${TLS_TARGETS} tls-shared)
32endif()
33
34install(TARGETS ${TLS_TARGETS} DESTINATION lib)