Land #400, Use groups in CMake install command for libraries

1 files changed, 10 insertions, 6 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index afa57b3..b3fd0cb 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -807,7 +807,9 @@ if(EXTRA_EXPORT)
 endif()
 
 add_library(crypto-objects OBJECT ${CRYPTO_SRC})
+set(CRYPTO_LIBRARIES crypto)
 if (BUILD_SHARED)
+        list(APPEND CRYPTO_LIBRARIES crypto-shared)
         add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>)
         add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>)
         export_symbol(crypto-shared ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
@@ -820,13 +822,15 @@ if (BUILD_SHARED)
                 ARCHIVE_OUTPUT_NAME crypto${CRYPTO_POSTFIX})
         set_target_properties(crypto-shared PROPERTIES VERSION
                 ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION})
-        if(ENABLE_LIBRESSL_INSTALL)
-                install(TARGETS crypto crypto-shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-        endif(ENABLE_LIBRESSL_INSTALL)
 else()
         add_library(crypto STATIC ${CRYPTO_SRC})
-        if(ENABLE_LIBRESSL_INSTALL)
-                install(TARGETS crypto DESTINATION ${CMAKE_INSTALL_LIBDIR})
-        endif(ENABLE_LIBRESSL_INSTALL)
 endif()
 
+if(ENABLE_LIBRESSL_INSTALL)
+        install(
+                TARGETS ${CRYPTO_LIBRARIES}
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        )
+endif(ENABLE_LIBRESSL_INSTALL)