Skip to content

Commit

Permalink
build: land initial ios support
Browse files Browse the repository at this point in the history
tried with:

- ./tools/build --variant cli --system ios --arch arm64 --cmake-build-type MinSizeRel -nc -no-packaging
- ./tools/build --variant cli --system ios --subsystem simulator --arch arm64 --cmake-build-type MinSizeRel -nc -no-packaging
- ./tools/build --variant cli --system ios --subsystem simulator --arch x86_64 --cmake-build-type MinSizeRel -nc -no-packaging
  • Loading branch information
Chilledheart committed Dec 16, 2023
1 parent 9a2c212 commit c319588
Show file tree
Hide file tree
Showing 6 changed files with 1,171 additions and 11 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1659,7 +1659,7 @@ if (HAVE_FLOCK)
add_definitions(-DHAVE_FLOCK)
endif()

if (NOT WIN32)
if (NOT WIN32 AND NOT APPLE)
check_library_exists(c pipe2 "" HAVE_PIPE2)
check_library_exists(c dup3 "" HAVE_DUP3)
endif()
Expand Down Expand Up @@ -1783,7 +1783,7 @@ elseif (WIN32 AND GUI)
else()
set(GUI_LIBRARIES rasapi32 wininet shlwapi winmm gdi32 comdlg32 ole32 comctl32 shell32)
endif()
elseif (APPLE AND GUI AND COMPILER_CLANG)
elseif (APPLE AND GUI AND NOT IOS)
message(STATUS "Compiling with GUI support: Cocoa")
find_library(COCOA_LIBRARY Cocoa REQUIRED)
# Locate Interface Builder Tool, needed to build things like Storyboards outside of Xcode.
Expand Down Expand Up @@ -3341,7 +3341,7 @@ if (CLI)
yass_base
)

if (NOT CMAKE_SKIP_INSTALL_RULES AND NOT WIN32)
if (NOT CMAKE_SKIP_INSTALL_RULES AND NOT WIN32 AND NOT IOS)
install(TARGETS yass_cli RUNTIME DESTINATION bin)
# TODO add freebsd rc files
if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID AND NOT OHOS)
Expand Down Expand Up @@ -3382,7 +3382,7 @@ if (SERVER)
yass_base
)

if (NOT CMAKE_SKIP_INSTALL_RULES AND NOT WIN32)
if (NOT CMAKE_SKIP_INSTALL_RULES AND NOT WIN32 AND NOT IOS)
install(TARGETS yass_server RUNTIME DESTINATION bin)
if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID AND NOT OHOS)
install(FILES yass-server.json.sample RENAME server.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/yass)
Expand Down
Loading

0 comments on commit c319588

Please sign in to comment.