rebase cmake fun

CMakeLists.txt

@@ -50,7 +50,6 @@ option(USE_AVX2 "enable avx2 code" OFF)
 option(USE_NETNS "enable networking namespace support. Linux only" OFF)
 option(NATIVE_BUILD "optimise for host system and FPU" ON)
 option(WITH_EMBEDDED_LOKINET "build liblokinet.so for embedded lokinet" OFF)
-option(BUILD_EMBEDDED_LOKINET "build embedded lokinet" OFF)
 option(LIBLOKINET_TEST_UTILS "build test utils in contrib/liblokinet" OFF)
 option(XSAN "use sanitiser, if your system has it (requires -DCMAKE_BUILD_TYPE=Debug)" OFF)
 option(USE_JEMALLOC "Link to jemalloc for memory allocations, if found" ON)
@@ -77,9 +76,13 @@ option(STATIC_LINK "link statically against dependencies" ${BUILD_STATIC_DEPS})
 if(BUILD_STATIC_DEPS AND NOT STATIC_LINK)
   message(FATAL_ERROR "Option BUILD_STATIC_DEPS requires STATIC_LINK to be enabled as well")
 endif()
+
+if (BUILD_STATIC_DEPS OR WITH_EMBEDDED_LOKINET)
+  include(cmake/combine_archives.cmake)
+endif()
+
 if(BUILD_STATIC_DEPS)
   set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
-  include(cmake/combine_archives.cmake)
   include(StaticBuild)
 endif()
 
@@ -328,7 +331,7 @@ if(ANDROID)
   add_subdirectory(jni)
 endif()
 
-if(BUILD_LIBLOKINET AND LIBLOKINET_TEST_UTILS)
+if(WITH_EMBEDDED_LOKINET AND LIBLOKINET_TEST_UTILS)
   add_subdirectory(contrib/liblokinet)
 endif()
 

contrib/cross.sh

@@ -45,7 +45,7 @@ for arch in $archs ; do
         -DSTATIC_LINK=ON \
         -DBUILD_SHARED_LIBS=OFF \
         -DBUILD_TESTING=OFF \
-        -DBUILD_LIBLOKINET=OFF \
+        -DWITH_EMBEDDED_LOKINET=OFF \
         -DWITH_TESTS=OFF \
         -DNATIVE_BUILD=OFF \
         -DSTATIC_LINK=ON \