diff options
| author | Don <don.j.olmstead@gmail.com> | 2022-08-29 13:52:53 -0700 |
|---|---|---|
| committer | Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-07 19:25:45 +0000 |
| commit | 9f426b60fabf5e5fec0a0a05120de19289ef1fdf (patch) | |
| tree | 268ba3bfccb715404ae919bbd18a8487fcd569eb | |
| parent | 1510e460c646777346bebb9eb060d4c50e093813 (diff) | |
| download | boringssl-9f426b60fabf5e5fec0a0a05120de19289ef1fdf.zip boringssl-9f426b60fabf5e5fec0a0a05120de19289ef1fdf.tar.gz boringssl-9f426b60fabf5e5fec0a0a05120de19289ef1fdf.tar.bz2 | |
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 <dthorn@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
| -rw-r--r-- | crypto/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ssl/CMakeLists.txt | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 72bcce8..d769efd 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -438,7 +438,11 @@ target_include_directories(crypto INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include> ) -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 67a72ae..b4b1032 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -45,7 +45,11 @@ target_include_directories(ssl INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include> ) -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) |