From ca56c332e3356118441c955e690f6727a9928b69 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 7 Sep 2015 01:05:33 -0500 Subject: disable shared CMake builds for OS X / Windows for now --- CMakeLists.txt | 4 ++++ crypto/CMakeLists.txt | 12 ++++++++---- ssl/CMakeLists.txt | 13 +++++++++---- tls/CMakeLists.txt | 13 +++++++++---- 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) set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) endif() +if(NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin" OR MSVC)) + set(BUILD_SHARED true) +endif() + add_subdirectory(crypto) add_subdirectory(ssl) add_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() add_library(crypto-objects OBJECT ${CRYPTO_SRC}) set_property(TARGET crypto-objects PROPERTY POSITION_INDEPENDENT_CODE 1) add_library(crypto STATIC $) -add_library(crypto-shared SHARED $) -set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto) -set_target_properties(crypto-shared PROPERTIES VERSION ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION}) -install(TARGETS crypto crypto-shared DESTINATION lib) +set(CRYPTO_TARGETS crypto) +if (BUILD_SHARED) + add_library(crypto-shared SHARED $) + 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) +endif() +install(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( add_library(ssl-objects OBJECT ${SSL_SRC}) set_property(TARGET ssl-objects PROPERTY POSITION_INDEPENDENT_CODE 1) add_library(ssl STATIC $) -add_library(ssl-shared SHARED $) -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) -install(TARGETS ssl ssl-shared DESTINATION lib) +if (BUILD_SHARED) + add_library(ssl-shared SHARED $) + 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) +endif() + +install(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() add_library(tls-objects OBJECT ${TLS_SRC}) set_property(TARGET tls-objects PROPERTY POSITION_INDEPENDENT_CODE 1) 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) -install(TARGETS tls tls-shared DESTINATION lib) +if (BUILD_SHARED) + 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) +endif() + +install(TARGETS ${TLS_TARGETS} DESTINATION lib) -- cgit v1.2.3-55-g6feb