diff options
| author | Don <don.j.olmstead@gmail.com> | 2018-03-16 13:59:26 -0700 |
|---|---|---|
| committer | Don <don.j.olmstead@gmail.com> | 2018-03-16 13:59:26 -0700 |
| commit | 5fb488de9f70d9d306c83d1316998e86d95f4a4e (patch) | |
| tree | aa49668b85b9f28152091e4aeb1711066ba95e8d /tls | |
| parent | 639a6629ae4b2243d1d15670f90750c3200ff4bf (diff) | |
| download | portable-5fb488de9f70d9d306c83d1316998e86d95f4a4e.tar.gz portable-5fb488de9f70d9d306c83d1316998e86d95f4a4e.tar.bz2 portable-5fb488de9f70d9d306c83d1316998e86d95f4a4e.zip | |
Use groups in CMake install command for libraries
On Windows shared libraries should be installed into the bin directory. Using grouping within CMake based on the target type fixes this issue.
Diffstat (limited to 'tls')
| -rw-r--r-- | tls/CMakeLists.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index 0e13da5..71f505a 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt | |||
| @@ -37,7 +37,9 @@ else() | |||
| 37 | endif() | 37 | endif() |
| 38 | 38 | ||
| 39 | add_library(tls-objects OBJECT ${TLS_SRC}) | 39 | add_library(tls-objects OBJECT ${TLS_SRC}) |
| 40 | set(TLS_LIBRARIES tls) | ||
| 40 | if (BUILD_SHARED) | 41 | if (BUILD_SHARED) |
| 42 | list(APPEND TLS_LIBRARIES tls-shared) | ||
| 41 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) | 43 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) |
| 42 | add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) | 44 | add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) |
| 43 | export_symbol(tls-shared ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym) | 45 | export_symbol(tls-shared ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym) |
| @@ -51,13 +53,15 @@ if (BUILD_SHARED) | |||
| 51 | ARCHIVE_OUTPUT_NAME tls${TLS_POSTFIX}) | 53 | ARCHIVE_OUTPUT_NAME tls${TLS_POSTFIX}) |
| 52 | set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} | 54 | set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} |
| 53 | SOVERSION ${TLS_MAJOR_VERSION}) | 55 | SOVERSION ${TLS_MAJOR_VERSION}) |
| 54 | if(ENABLE_LIBRESSL_INSTALL) | ||
| 55 | install(TARGETS tls tls-shared DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| 56 | endif(ENABLE_LIBRESSL_INSTALL) | ||
| 57 | else() | 56 | else() |
| 58 | add_library(tls STATIC ${TLS_SRC}) | 57 | add_library(tls STATIC ${TLS_SRC}) |
| 59 | if(ENABLE_LIBRESSL_INSTALL) | ||
| 60 | install(TARGETS tls DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
| 61 | endif(ENABLE_LIBRESSL_INSTALL) | ||
| 62 | endif() | 58 | endif() |
| 63 | 59 | ||
| 60 | if(ENABLE_LIBRESSL_INSTALL) | ||
| 61 | install( | ||
| 62 | TARGETS ${TLS_LIBRARIES} | ||
| 63 | ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| 64 | LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| 65 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| 66 | ) | ||
| 67 | endif(ENABLE_LIBRESSL_INSTALL) | ||