From 9f426b60fabf5e5fec0a0a05120de19289ef1fdf Mon Sep 17 00:00:00 2001 From: Don Date: Mon, 29 Aug 2022 13:52:53 -0700 Subject: [PATCH] Specify all library install destinations When installing a library individual destinations should be specified. This is required on Windows which has a .dll that goes in the runtime destination while the .lib ends up in the library destination. Change-Id: I93cf51089f71c4375324270c6b1c4eadbc637477 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/54147 Reviewed-by: Daniel Thornburgh Reviewed-by: David Benjamin Commit-Queue: David Benjamin --- crypto/CMakeLists.txt | 6 +++++- ssl/CMakeLists.txt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 72bcce8eb..d769efdaa 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -438,7 +438,11 @@ target_include_directories(crypto INTERFACE $ $ ) -install(TARGETS crypto EXPORT OpenSSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(TARGETS crypto EXPORT OpenSSLTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) set_property(TARGET crypto PROPERTY EXPORT_NAME Crypto) if(FIPS_SHARED) diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index 67a72ae26..b4b103261 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -45,7 +45,11 @@ target_include_directories(ssl INTERFACE $ $ ) -install(TARGETS ssl EXPORT OpenSSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(TARGETS ssl EXPORT OpenSSLTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) set_property(TARGET ssl PROPERTY EXPORT_NAME SSL) add_dependencies(ssl global_target)