oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

fix linker error and clean a bit of cmake

Browse source
This commit is contained in:
Thomas Winget 2023-02-08 15:24:37 -05:00
parent e0b55f613f
commit c1a8c3cd45
1 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
llarp/CMakeLists.txt
View file

@ -440,7 +440,7 @@ function(link_lokinet_layers)
lokinet_link_lib(${ARGV1} ${lib})
list(REMOVE_AT ARGV 1)
target_link_libraries(${lib} PRIVATE ${ARGV1})
# recursion :D
# recursion :D
link_lokinet_layers(${ARGV})
else()
lokinet_link_lib(${lib})
@ -520,34 +520,20 @@ target_link_libraries(lokinet-plainquic PUBLIC
if(WITH_EMBEDDED_LOKINET)
include(GNUInstallDirs)
add_library(lokinet-embedded-api STATIC lokinet_shared.cpp)
lokinet_link_lib(lokinet-embedded-api)
target_link_libraries(lokinet-embedded-api PUBLIC ngtcp2_static)
add_library(lokinet-embedded-api lokinet_shared.cpp)
target_link_libraries(lokinet-embedded-api PUBLIC lokinet-amalgum)
if(BUILD_STATIC_DEPS)
get_target_property(embedded-libs lokinet-amalgum INTERFACE_LINK_LIBRARIES)
combine_archives(lokinet-embedded ${embedded-libs})
endif()
if(WIN32)
set(CMAKE_SHARED_LIBRARY_PREFIX_CXX "")
endif()
if(WIN32)
target_link_libraries(lokinet-embedded-api PUBLIC ws2_32 iphlpapi -fstack-protector)
install(TARGETS lokinet-embedded-api DESTINATION bin COMPONENT liblokinet)
else()
get_target_property(embedded-libs lokinet-amalgum INTERFACE_LINK_LIBRARIES)
combine_archives(lokinet-embedded
${embedded-libs}
ngtcp2_static
uv_a::uv_a
sodium
zlib
OpenSSL::SSL
OpenSSL::Crypto
expat
libunbound
libzmq
fmt::fmt
spdlog::spdlog
oxen::logging
oxenmq::oxenmq)
install(TARGETS lokinet-embedded LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT liblokinet)
endif()
install(TARGETS lokinet-embedded-api DESTINATION bin COMPONENT liblokinet)
endif()
file(GLOB_RECURSE docs_SRC */*.hpp *.hpp)