fixup ios

CMakeLists.txt

@@ -213,17 +213,6 @@ if(ANDROID)
   set(ANDROID_PLATFORM_SRC android/ifaddrs.c)
 endif(ANDROID)
 
-set(LIBTUNTAP_SRC_BASE
-  ${TT_ROOT}/tuntap.cpp
-  ${TT_ROOT}/tuntap_log.cpp
-  ${LIBTUNTAP_IMPL})
-
-if(UNIX)
-  set(LIBTUNTAP_SRC ${TT_ROOT}/tuntap-unix.c ${LIBTUNTAP_SRC_BASE})
-else()
-  set(LIBTUNTAP_SRC ${LIBTUNTAP_SRC_BASE})
-endif()
-
 set(LIBS ${MALLOC_LIB} ${FS_LIB} ${LIBUV_LIBRARY})
 
 add_subdirectory(crypto)

cmake/add_log_tag.cmake

@@ -1,6 +1,8 @@
 function(add_log_tag target)
-  get_target_property(TARGET_SRCS ${target} SOURCES)
-  foreach(F ${TARGET_SRCS})
-    set_source_files_properties(${F} PROPERTIES COMPILE_FLAGS -DLOG_TAG=\\\"${F}\\\")
-  endforeach(F)
+  if(TARGET ${target})
+    get_target_property(TARGET_SRCS ${target} SOURCES)
+    foreach(F ${TARGET_SRCS})
+      set_source_files_properties(${F} PROPERTIES COMPILE_FLAGS -DLOG_TAG=\\\"${F}\\\")
+    endforeach(F)
+  endif()
 endfunction()

cmake/basic_definitions.cmake

@@ -9,8 +9,13 @@ set(ANDROID_LIB ${LIB}android)
 set(ABYSS libabyss)
 set(ABYSS_LIB abyss)
 set(ABYSS_EXE ${ABYSS_LIB}-main)
-get_filename_component(TT_ROOT "vendor/libtuntap-master" ABSOLUTE)
+get_filename_component(TT_ROOT "${CMAKE_CURRENT_LIST_DIR}/../vendor/libtuntap-master" ABSOLUTE)
 add_definitions(-D${CMAKE_SYSTEM_NAME})
 
 get_filename_component(CORE_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include" ABSOLUTE)
 get_filename_component(ABYSS_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/${ABYSS}/include" ABSOLUTE)
+
+set(LIBTUNTAP_SRC
+  ${TT_ROOT}/tuntap.cpp
+  ${TT_ROOT}/tuntap_log.cpp
+  ${LIBTUNTAP_IMPL})

cmake/unix.cmake

@@ -7,6 +7,7 @@ include(CheckLibraryExists)
 
 add_definitions(-DUNIX)
 add_definitions(-DPOSIX)
+list(APPEND LIBTUNTAP_SRC ${TT_ROOT}/tuntap-unix.c)
 
 if (STATIC_LINK_RUNTIME OR STATIC_LINK)
   set(LIBUV_USE_STATIC ON)

libabyss/CMakeLists.txt

@@ -4,20 +4,19 @@ add_library(${ABYSS_LIB} "${CMAKE_CURRENT_SOURCE_DIR}/src/md5.cpp"
                          "${CMAKE_CURRENT_SOURCE_DIR}/src/server.cpp")
 
 target_include_directories(${ABYSS_LIB} PUBLIC include)
+target_link_libraries(${ABYSS_LIB} PUBLIC ${PLATFORM_LIB})
 
-if(NOT WIN32)
-  target_link_libraries(${ABYSS_LIB} PUBLIC ${PLATFORM_LIB} ${LIBUV_LIBRARY})
+if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL iOS)
+  target_link_libraries(${ABYSS_LIB} PUBLIC ${LIBUV_LIBRARY})
   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})
+elseif(MSVC_VERSION)
   add_executable(${ABYSS_EXE} main.cpp)
   target_link_libraries(${ABYSS_EXE} PUBLIC ${ABYSS_LIB} ${STATIC_LIB} ws2_32)
-endif(NOT WIN32)
+elseif(NOT CMAKE_SYSTEM_NAME STREQUAL iOS)
+  add_executable(${ABYSS_EXE} main.cpp llarp/win32/abyss.rc)
+  target_link_libraries(${ABYSS_EXE} PUBLIC ${ABYSS_LIB} ${STATIC_LIB} ws2_32)
+endif()
 
 # for freebsd
 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")

ui-ios/CMakeLists.txt

@@ -31,7 +31,9 @@ add_subdirectory(${libuv_SOURCE_DIR} ${libuv_BINARY_DIR})
 
 include("${LOKINET_ROOT}/cmake/basic_definitions.cmake")
 set(LIBUV_IN_SOURCE ON)
+set(LIBUV_LIBRARY uv_a)
 include("${LOKINET_ROOT}/cmake/unix.cmake")
+unset(LIBTUNTAP_SRC)
 
 find_package(Threads REQUIRED)