More CI fixes

docker/compose/compose-base.Dockerfile

@@ -12,5 +12,5 @@ RUN make NINJA=ninja STATIC_LINK=ON BUILD_TYPE=Release
 
 FROM alpine:latest
 
-COPY --from=builder /src/build/lokinet /
-COPY --from=builder /src/build/lokinet-rcutil /
+COPY --from=builder /src/build/daemon/lokinet /
+COPY --from=builder /src/build/daemon/lokinet-rcutil /

docker/router.Dockerfile

@@ -13,7 +13,7 @@ RUN ./lokinet-bootstrap ${bootstrap}
 FROM alpine:latest
 
 COPY lokinet-docker.ini /root/.lokinet/lokinet.ini
-COPY --from=builder /src/build/lokinet .
+COPY --from=builder /src/build/daemon/lokinet .
 COPY --from=builder /root/.lokinet/bootstrap.signed /root/.lokinet/
 
 CMD ["./lokinet"]

libabyss/CMakeLists.txt

@@ -10,9 +10,11 @@ if(NOT WIN32)
   add_executable(${ABYSS_EXE} main.cpp)
   target_link_libraries(${ABYSS_EXE} PUBLIC ${ABYSS_LIB} Threads::Threads ${LIBS})
 elseif(NOT MSVC_VERSION)
+  target_link_libraries(${ABYSS_LIB} PUBLIC ${PLATFORM_LIB})
   add_executable(${ABYSS_EXE} main.cpp llarp/win32/abyss.rc)
   target_link_libraries(${ABYSS_EXE} PUBLIC ${ABYSS_LIB} ${STATIC_LIB} ws2_32)
 else()
+  target_link_libraries(${ABYSS_LIB} PUBLIC ${PLATFORM_LIB})
   add_executable(${ABYSS_EXE} main.cpp)
   target_link_libraries(${ABYSS_EXE} PUBLIC ${ABYSS_LIB} ${STATIC_LIB} ws2_32)
 endif(NOT WIN32)

ui-ios/CMakeLists.txt

@@ -51,6 +51,10 @@ include_directories("${libuv_SOURCE_DIR}/include")
 add_loki_dir(vendor/gtest)
 add_subdirectory(${ABSEIL_DIR} "vendor/abseil-cpp")
 
+if (FS_LIB STREQUAL "cppbackport")
+  add_loki_dir(vendor)
+endif()
+
 add_loki_dir(crypto)
 add_loki_dir(llarp)
 add_loki_dir(libabyss)