From 5fb488de9f70d9d306c83d1316998e86d95f4a4e Mon Sep 17 00:00:00 2001 From: Don Date: Fri, 16 Mar 2018 13:59:26 -0700 Subject: 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. --- ssl/CMakeLists.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'ssl') diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index 3ea16a8..93f20ee 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -47,7 +47,9 @@ set( ) add_library(ssl-objects OBJECT ${SSL_SRC}) +set(SSL_LIBRARIES ssl) if (BUILD_SHARED) + list(APPEND SSL_LIBRARIES ssl-shared) add_library(ssl STATIC $) add_library(ssl-shared SHARED $) export_symbol(ssl-shared ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) @@ -61,12 +63,15 @@ if (BUILD_SHARED) ARCHIVE_OUTPUT_NAME ssl${SSL_POSTFIX}) set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION} SOVERSION ${SSL_MAJOR_VERSION}) - if(ENABLE_LIBRESSL_INSTALL) - install(TARGETS ssl ssl-shared DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(ENABLE_LIBRESSL_INSTALL) else() add_library(ssl STATIC ${SSL_SRC}) - if(ENABLE_LIBRESSL_INSTALL) - install(TARGETS ssl DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(ENABLE_LIBRESSL_INSTALL) endif() + +if(ENABLE_LIBRESSL_INSTALL) + install( + TARGETS ${SSL_LIBRARIES} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) +endif(ENABLE_LIBRESSL_INSTALL) -- cgit v1.2.3-55-g6feb