diff options
| author | Brent Cook <bcook@openbsd.org> | 2015-09-07 01:05:33 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-09-07 01:05:33 -0500 |
| commit | ca56c332e3356118441c955e690f6727a9928b69 (patch) | |
| tree | 4df1dc6d552b44dea1cca3d94c0c4a30d66c8218 | |
| parent | 4078416c36124e86275b093519f7c0d772ee25b8 (diff) | |
| download | portable-ca56c332e3356118441c955e690f6727a9928b69.tar.gz portable-ca56c332e3356118441c955e690f6727a9928b69.tar.bz2 portable-ca56c332e3356118441c955e690f6727a9928b69.zip | |
disable shared CMake builds for OS X / Windows for now
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | crypto/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | ssl/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | 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) | |||
| 158 | set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) | 158 | set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) |
| 159 | endif() | 159 | endif() |
| 160 | 160 | ||
| 161 | if(NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin" OR MSVC)) | ||
| 162 | set(BUILD_SHARED true) | ||
| 163 | endif() | ||
| 164 | |||
| 161 | add_subdirectory(crypto) | 165 | add_subdirectory(crypto) |
| 162 | add_subdirectory(ssl) | 166 | add_subdirectory(ssl) |
| 163 | add_subdirectory(apps) | 167 | 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() | |||
| 641 | add_library(crypto-objects OBJECT ${CRYPTO_SRC}) | 641 | add_library(crypto-objects OBJECT ${CRYPTO_SRC}) |
| 642 | set_property(TARGET crypto-objects PROPERTY POSITION_INDEPENDENT_CODE 1) | 642 | set_property(TARGET crypto-objects PROPERTY POSITION_INDEPENDENT_CODE 1) |
| 643 | add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>) | 643 | add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>) |
| 644 | add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>) | 644 | set(CRYPTO_TARGETS crypto) |
| 645 | set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto) | ||
| 646 | set_target_properties(crypto-shared PROPERTIES VERSION ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION}) | ||
| 647 | install(TARGETS crypto crypto-shared DESTINATION lib) | ||
| 648 | 645 | ||
| 646 | if (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) | ||
| 651 | endif() | ||
| 649 | 652 | ||
| 653 | 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( | |||
| 53 | add_library(ssl-objects OBJECT ${SSL_SRC}) | 53 | add_library(ssl-objects OBJECT ${SSL_SRC}) |
| 54 | set_property(TARGET ssl-objects PROPERTY POSITION_INDEPENDENT_CODE 1) | 54 | set_property(TARGET ssl-objects PROPERTY POSITION_INDEPENDENT_CODE 1) |
| 55 | add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>) | 55 | add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>) |
| 56 | add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>) | 56 | set(SSL_TARGETS ssl) |
| 57 | set_target_properties(ssl-shared PROPERTIES OUTPUT_NAME ssl) | ||
| 58 | set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION} SOVERSION ${SSL_MAJOR_VERSION}) | ||
| 59 | 57 | ||
| 60 | install(TARGETS ssl ssl-shared DESTINATION lib) | 58 | if (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) | ||
| 63 | endif() | ||
| 64 | |||
| 65 | 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() | |||
| 22 | add_library(tls-objects OBJECT ${TLS_SRC}) | 22 | add_library(tls-objects OBJECT ${TLS_SRC}) |
| 23 | set_property(TARGET tls-objects PROPERTY POSITION_INDEPENDENT_CODE 1) | 23 | set_property(TARGET tls-objects PROPERTY POSITION_INDEPENDENT_CODE 1) |
| 24 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) | 24 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) |
| 25 | add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) | 25 | set(TLS_TARGETS tls) |
| 26 | set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls) | ||
| 27 | set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} SOVERSION ${TLS_MAJOR_VERSION}) | ||
| 28 | 26 | ||
| 29 | install(TARGETS tls tls-shared DESTINATION lib) | 27 | if (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) | ||
| 32 | endif() | ||
| 33 | |||
| 34 | install(TARGETS ${TLS_TARGETS} DESTINATION lib) | ||
