File tree Expand file tree Collapse file tree 1 file changed +15
-5
lines changed Expand file tree Collapse file tree 1 file changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -108,14 +108,16 @@ if (LLAMA_BUILD_BORINGSSL)
108108 endif ()
109109
110110 if (NOT boringssl_POPULATED)
111- # force BUILD_SHARED_LIBS=OFF, avoid installing SSL libs
112- set (SAVED_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS} )
113- set (BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
114-
115111 FetchContent_Populate(boringssl)
116112 add_subdirectory (${boringssl_SOURCE_DIR} ${boringssl_BINARY_DIR} EXCLUDE_FROM_ALL )
117113
118- set (BUILD_SHARED_LIBS ${SAVED_BUILD_SHARED_LIBS} CACHE BOOL "" FORCE)
114+ if (TARGET ssl)
115+ set_target_properties (ssl PROPERTIES OUTPUT_NAME "llama-ssl" )
116+ endif ()
117+
118+ if (TARGET crypto)
119+ set_target_properties (crypto PROPERTIES OUTPUT_NAME "llama-crypto" )
120+ endif ()
119121 endif ()
120122
121123 set (BORINGSSL_FLAGS
@@ -140,6 +142,14 @@ if (LLAMA_BUILD_BORINGSSL)
140142 set (CPPHTTPLIB_OPENSSL_SUPPORT TRUE )
141143 target_link_libraries (${TARGET} PUBLIC ssl crypto)
142144
145+ if (BUILD_SHARED_LIBS )
146+ install (TARGETS ssl crypto
147+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
148+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
149+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
150+ )
151+ endif ()
152+
143153elseif (LLAMA_OPENSSL)
144154 find_package (OpenSSL)
145155 if (OpenSSL_FOUND)
You can’t perform that action at this time.
0 commit comments