addmore

cmake/combine_archives.cmake

@@ -5,14 +5,12 @@ function(combine_archives output_archive)
                      COMMAND touch ${output_archive_dummy_file}
                      DEPENDS ${ARGN})
   add_library(${output_archive} STATIC EXCLUDE_FROM_ALL ${output_archive_dummy_file})
-  
+
   if(NOT APPLE)
     set(mri_file ${CMAKE_CURRENT_BINARY_DIR}/${output_archive}.mri)
     set(mri_content "create ${FULL_OUTPUT_PATH}\n")
-    foreach(in_lib ${ARGV})
-      foreach(lib $<INTERFACE_LINK_LIBRARIES:${in_lib}>)
-        string(APPEND mri_content "addlib $<TARGET_FILE:${lib}>\n")
-      endforeach()
+    foreach(in_archive ${ARGN})
+        string(APPEND mri_content "addlib $<TARGET_FILE:${in_archive}>\n")
     endforeach()
     string(APPEND mri_content "save\nend\n")
     file(GENERATE OUTPUT ${mri_file} CONTENT "${mri_content}")
@@ -22,10 +20,8 @@ function(combine_archives output_archive)
                        COMMAND ar -M < ${mri_file})
   else()
     set(merge_libs)
-    foreach(in_lib in ${ARGV})
-      foreach(lib in $<INTERFACE_LINK_LIBRARIES:${in_lib})
-        list(APPEND merge_libs $<TARGET_FILE:${lib}>)
-      endforeach()
+    foreach(in_archive ${ARGN})
+      list(APPEND merge_libs $<TARGET_FILE:${in_archive}>)
     endforeach()
     add_custom_command(TARGET ${output_archive}
                        POST_BUILD

llarp/CMakeLists.txt

@@ -530,7 +530,21 @@ if(WITH_EMBEDDED_LOKINET)
     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})
+    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()
 endif()