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 /tls | |
| 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 'tls')
| -rw-r--r-- | tls/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index 396780c..68ab3f4 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt | |||
| @@ -19,16 +19,16 @@ if(NOT HAVE_STRCASECMP) | |||
| 19 | set(TLS_SRC ${TLS_SRC} strsep.c) | 19 | set(TLS_SRC ${TLS_SRC} strsep.c) |
| 20 | endif() | 20 | endif() |
| 21 | 21 | ||
| 22 | add_library(tls-objects OBJECT ${TLS_SRC}) | ||
| 23 | set_property(TARGET tls-objects PROPERTY POSITION_INDEPENDENT_CODE 1) | ||
| 24 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) | ||
| 25 | set(TLS_TARGETS tls) | ||
| 26 | |||
| 27 | if (BUILD_SHARED) | 22 | if (BUILD_SHARED) |
| 23 | add_library(tls-objects OBJECT ${TLS_SRC}) | ||
| 24 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) | ||
| 28 | add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) | 25 | add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) |
| 29 | set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls) | 26 | set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls) |
| 30 | set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} SOVERSION ${TLS_MAJOR_VERSION}) | 27 | set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} |
| 31 | set(TLS_TARGETS ${TLS_TARGETS} tls-shared) | 28 | SOVERSION ${TLS_MAJOR_VERSION}) |
| 29 | install(TARGETS tls tls-shared DESTINATION lib) | ||
| 30 | else() | ||
| 31 | add_library(tls STATIC ${TLS_SRC}) | ||
| 32 | install(TARGETS tls DESTINATION lib) | ||
| 32 | endif() | 33 | endif() |
| 33 | 34 | ||
| 34 | install(TARGETS ${TLS_TARGETS} DESTINATION lib) | ||