diff options
author | Brent Cook <bcook@openbsd.org> | 2015-09-09 05:15:06 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-09-09 06:03:52 -0500 |
commit | adfb2bf72257c4d622f4be8f897c5ddafa4e58ae (patch) | |
tree | 3b6969d7328069b41d28109e667df8493356600a /crypto | |
parent | 5f4e95e7c16a63bbda4f3654126cc81806f779d8 (diff) | |
download | portable-adfb2bf72257c4d622f4be8f897c5ddafa4e58ae.tar.gz portable-adfb2bf72257c4d622f4be8f897c5ddafa4e58ae.tar.bz2 portable-adfb2bf72257c4d622f4be8f897c5ddafa4e58ae.zip |
Do not build lib-objects targets if we are just building static libs.
This confuses some cmake targets.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
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) | |||
638 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c) | 638 | set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c) |
639 | endif() | 639 | endif() |
640 | 640 | ||
641 | add_library(crypto-objects OBJECT ${CRYPTO_SRC}) | ||
642 | set_property(TARGET crypto-objects PROPERTY POSITION_INDEPENDENT_CODE 1) | ||
643 | add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>) | ||
644 | set(CRYPTO_TARGETS crypto) | ||
645 | |||
646 | if (BUILD_SHARED) | 641 | if (BUILD_SHARED) |
642 | add_library(crypto-objects OBJECT ${CRYPTO_SRC}) | ||
643 | add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>) | ||
647 | add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>) | 644 | add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>) |
648 | set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto) | 645 | set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto) |
649 | set_target_properties(crypto-shared PROPERTIES VERSION ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION}) | 646 | set_target_properties(crypto-shared PROPERTIES VERSION |
650 | set(CRYPTO_TARGETS ${CRYPTO_TARGETS} crypto-shared) | 647 | ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION}) |
648 | install(TARGETS crypto crypto-shared DESTINATION lib) | ||
649 | else() | ||
650 | add_library(crypto STATIC ${CRYPTO_SRC}) | ||
651 | install(TARGETS crypto DESTINATION lib) | ||
651 | endif() | 652 | endif() |
652 | 653 | ||
653 | install(TARGETS ${CRYPTO_TARGETS} DESTINATION lib) | ||