iv-org-mirror/litespeed-quic
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/litespeed-quic.git synced 2024-08-15 00:53:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:litespeedtech/lsquic

Browse source
This commit is contained in:
George Wang 2022-05-05 18:58:03 -04:00
commit c4854d203f
3 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -167,7 +167,7 @@ ELSE()
ENDIF() ENDIF()
IF (NOT DEFINED BORINGSSL_LIB AND DEFINED BORINGSSL_DIR) IF (NOT DEFINED BORINGSSL_LIB AND DEFINED BORINGSSL_DIR)
FOREACH(LIB_NAME ssl crypto decrepit) FOREACH(LIB_NAME ssl crypto)
IF (CMAKE_SYSTEM_NAME STREQUAL Windows) IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME} FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
NAMES ${LIB_NAME} NAMES ${LIB_NAME}
@ -190,14 +190,13 @@ IF (NOT DEFINED BORINGSSL_LIB AND DEFINED BORINGSSL_DIR)
ELSE() ELSE()
FOREACH(LIB_NAME ssl crypto decrepit) FOREACH(LIB_NAME ssl crypto)
# If BORINGSSL_LIB is defined, try find each lib. Otherwise, user should define BORINGSSL_LIB_ssl, # If BORINGSSL_LIB is defined, try find each lib. Otherwise, user should define BORINGSSL_LIB_ssl,
# BORINGSSL_LIB_crypto and so on explicitly. For example, including boringssl and lsquic both via # BORINGSSL_LIB_crypto and so on explicitly. For example, including boringssl and lsquic both via
# add_subdirectory: # add_subdirectory:
# add_subdirectory(third_party/boringssl) # add_subdirectory(third_party/boringssl)
# set(BORINGSSL_LIB_ssl ssl) # set(BORINGSSL_LIB_ssl ssl)
# set(BORINGSSL_LIB_crypto crypto) # set(BORINGSSL_LIB_crypto crypto)
# set(BORINGSSL_LIB_decrepit decrepit)
# add_subdirectory(third_party/lsquic) # add_subdirectory(third_party/lsquic)
IF (DEFINED BORINGSSL_LIB) IF (DEFINED BORINGSSL_LIB)
IF (CMAKE_SYSTEM_NAME STREQUAL Windows) IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
@ -336,3 +335,11 @@ INSTALL(FILES
include/lsxpack_header.h include/lsxpack_header.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lsquic DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lsquic
) )
if(WIN32)
# The other file in wincompat is not used in installed headers
INSTALL(FILES
wincompat/vc_compat.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lsquic
)
endif()

19
src/liblsquic/CMakeLists.txt
View file

@ -130,9 +130,28 @@ ELSE()
add_library(lsquic STATIC ${lsquic_STAT_SRCS}) add_library(lsquic STATIC ${lsquic_STAT_SRCS})
ENDIF() ENDIF()
target_include_directories(
lsquic PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/lsquic>)
install(TARGETS lsquic install(TARGETS lsquic
EXPORT lsquic-targets EXPORT lsquic-targets
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
include(CMakePackageConfigHelpers)
configure_package_config_file(
lsquic-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/lsquic-config.cmake
INSTALL_DESTINATION share/lsquic
NO_CHECK_REQUIRED_COMPONENTS_MACRO
PATH_VARS CMAKE_INSTALL_INCLUDEDIR)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/lsquic-config.cmake
DESTINATION share/lsquic)
install(
EXPORT lsquic-targets
DESTINATION share/lsquic
NAMESPACE lsquic::
FILE lsquic-targets.cmake)

4
src/liblsquic/lsquic-config.cmake Normal file
View file

@ -0,0 +1,4 @@
@PACKAGE_INIT@
set_and_check(lsquic_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
include("${CMAKE_CURRENT_LIST_DIR}/lsquic-targets.cmake")