diff options
| author | Brent Cook <bcook@openbsd.org> | 2015-09-09 05:15:06 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-09-11 16:36:26 -0500 |
| commit | 72039968e295bc235a126ad00c2d31df933a9b3d (patch) | |
| tree | ec1d5cd44d16b315b5b9c3638408be60b9400ab9 /ssl | |
| parent | 9c2f0ef51ce8d0f9210497f3b81b01c073cac3ae (diff) | |
| download | portable-72039968e295bc235a126ad00c2d31df933a9b3d.tar.gz portable-72039968e295bc235a126ad00c2d31df933a9b3d.tar.bz2 portable-72039968e295bc235a126ad00c2d31df933a9b3d.zip | |
Do not build lib-objects targets if we are just building static libs.
This confuses some cmake targets.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/CMakeLists.txt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index 65e872d..8aad1b4 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt | |||
| @@ -51,16 +51,15 @@ set( | |||
| 51 | t1_srvr.c | 51 | t1_srvr.c |
| 52 | ) | 52 | ) |
| 53 | 53 | ||
| 54 | add_library(ssl-objects OBJECT ${SSL_SRC}) | ||
| 55 | set_property(TARGET ssl-objects PROPERTY POSITION_INDEPENDENT_CODE 1) | ||
| 56 | add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>) | ||
| 57 | set(SSL_TARGETS ssl) | ||
| 58 | |||
| 59 | if (BUILD_SHARED) | 54 | if (BUILD_SHARED) |
| 55 | add_library(ssl-objects OBJECT ${SSL_SRC}) | ||
| 56 | add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>) | ||
| 60 | add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>) | 57 | add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>) |
| 61 | set_target_properties(ssl-shared PROPERTIES OUTPUT_NAME ssl) | 58 | set_target_properties(ssl-shared PROPERTIES OUTPUT_NAME ssl) |
| 62 | set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION} SOVERSION ${SSL_MAJOR_VERSION}) | 59 | set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION} |
| 63 | set(SSL_TARGETS ${SSL_TARGETS} ssl-shared) | 60 | SOVERSION ${SSL_MAJOR_VERSION}) |
| 61 | install(TARGETS ssl ssl-shared DESTINATION lib) | ||
| 62 | else() | ||
| 63 | add_library(ssl STATIC ${SSL_SRC}) | ||
| 64 | install(TARGETS ssl DESTINATION lib) | ||
| 64 | endif() | 65 | endif() |
| 65 | |||
| 66 | install(TARGETS ${SSL_TARGETS} DESTINATION lib) | ||
