From 9556741f6a3dce9eae6414fb919d5c408757497a Mon Sep 17 00:00:00 2001 From: Jeff Date: Tue, 10 May 2022 09:47:54 -0400 Subject: [PATCH] split up link order for oxenmq and oxenc * lokinet uberlib needs oxenc and oxenmq * lokinet-util only needs oxenc fixes #1911 --- CMakeLists.txt | 1 + llarp/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed45e5b70..7a36f117e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,6 +199,7 @@ if(OXENC_FOUND) else() message(STATUS "using oxen-encoding submodule") add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/oxen-encoding) + add_library(oxenc::oxenc ALIAS oxenc) endif() option(FORCE_OXENMQ_SUBMODULE "force using oxenmq submodule" OFF) diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt index d8a67086e..40786322b 100644 --- a/llarp/CMakeLists.txt +++ b/llarp/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries(lokinet-util PUBLIC nlohmann_json::nlohmann_json filesystem date::date - oxenmq::oxenmq + oxenc::oxenc ) if(ANDROID) @@ -59,7 +59,7 @@ add_library(lokinet-platform ) target_link_libraries(lokinet-platform PUBLIC lokinet-cryptography lokinet-util Threads::Threads base_libs uvw) - +target_link_libraries(lokinet-platform PRIVATE oxenmq::oxenmq) if (ANDROID) target_sources(lokinet-platform PRIVATE android/ifaddrs.c) @@ -242,7 +242,7 @@ if(WITH_HIVE) ) endif() -target_link_libraries(liblokinet PUBLIC cxxopts lokinet-platform lokinet-util lokinet-cryptography sqlite_orm ngtcp2_static) +target_link_libraries(liblokinet PUBLIC cxxopts oxenc::oxenc lokinet-platform lokinet-util lokinet-cryptography sqlite_orm ngtcp2_static oxenmq::oxenmq) target_link_libraries(liblokinet PRIVATE libunbound) pkg_check_modules(CRYPT libcrypt IMPORTED_TARGET) if(CRYPT_FOUND AND NOT CMAKE_CROSSCOMPILING)