nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #81 from briaguya-ai/archi-remove-checked-in-deps

Browse Source 
use cmake/package managers to get dependencies
This commit is contained in:
aMannus
2025-09-29 10:00:36 +02:00
committed by GitHub
parent 582bdbff14 59dc48724e
commit 8507431303
810 changed files with 84 additions and 217719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
soh/CMakeLists.txt
View File

@@ -284,23 +284,67 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
endif()
include(FetchContent)
################################################################################
# apclientpp + dependencies
################################################################################
add_compile_definitions(ASIO_STANDALONE)
target_include_directories(${PROJECT_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../subprojects/asio/include
${CMAKE_CURRENT_SOURCE_DIR}/../subprojects/websocketpp
${CMAKE_CURRENT_SOURCE_DIR}/../subprojects/wswrap/include
${CMAKE_CURRENT_SOURCE_DIR}/../subprojects/valijson/include
${CMAKE_CURRENT_SOURCE_DIR}/../subprojects/apclientpp
)
if(BUILD_REMOTE_CONTROL)
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
FetchContent_Declare(
valijson
GIT_REPOSITORY https://github.com/tristanpenman/valijson.git
GIT_TAG v1.0.6
)
FetchContent_MakeAvailable(valijson)
target_include_directories(${PROJECT_NAME} PRIVATE ${valijson_SOURCE_DIR}/include)
else()
find_package(valijson REQUIRED)
endif()
FetchContent_Declare(
asio
GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git
GIT_TAG asio-1-30-2
)
FetchContent_MakeAvailable(asio)
target_include_directories(${PROJECT_NAME} PRIVATE ${asio_SOURCE_DIR}/asio/include)
# websocketpp has been temporarily removed from vcpkg, see
# https://github.com/microsoft/vcpkg/pull/42678#issuecomment-2914451436
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
FetchContent_Declare(
websocketpp
GIT_REPOSITORY https://github.com/zaphoyd/websocketpp.git
GIT_TAG 0.8.2
)
FetchContent_Populate(websocketpp)
target_include_directories(${PROJECT_NAME} PRIVATE ${websocketpp_SOURCE_DIR})
else()
find_package(websocketpp REQUIRED)
endif()
FetchContent_Declare(
wswrap
GIT_REPOSITORY https://github.com/black-sliver/wswrap.git
GIT_TAG 47438193ec50427ee28aadf294ba57baefd9f3f1
)
FetchContent_MakeAvailable(wswrap)
target_include_directories(${PROJECT_NAME} PRIVATE ${wswrap_SOURCE_DIR}/include)
FetchContent_Declare(
apclientpp
GIT_REPOSITORY https://github.com/black-sliver/apclientpp.git
GIT_TAG 65638b7479f6894eda172e603cffa79762c0ddc1
)
FetchContent_MakeAvailable(apclientpp)
target_include_directories(${PROJECT_NAME} PRIVATE ${apclientpp_SOURCE_DIR})
endif()
# Find/download Dr Libs (For custom audio)
################################################################################
include(FetchContent)
FetchContent_Declare(
dr_libs
GIT_REPOSITORY https://github.com/mackron/dr_libs.git
@@ -318,7 +362,8 @@ if (BUILD_REMOTE_CONTROL)
find_package(SDL2_net)
if(NOT SDL2_net_FOUND)
message(STATUS "SDL2_net not found (it's possible the version installed is too old). Disabling BUILD_REMOTE_CONTROL.")
# todo: make archi optional so this can build with BUILD_REMOTE_CONTROL off
message(FATAL_ERROR "SDL2_net not found (it's possible the version installed is too old).")
set(BUILD_REMOTE_CONTROL 0)
else()
set(SDL2-NET-INCLUDE ${SDL_NET_INCLUDE_DIRS})
@@ -337,7 +382,8 @@ if (BUILD_REMOTE_CONTROL)
find_package(OpenSSL)
if(NOT OPENSSL_FOUND)
message(STATUS "OpenSSL not found (it's possible the version installed is too old). Disabling BUILD_REMOTE_CONTROL.")
# todo: make archi optional so this can build with BUILD_REMOTE_CONTROL off
message(FATAL_ERROR "OpenSSL not found (it's possible the version installed is too old).")
set(BUILD_REMOTE_CONTROL 0)
endif()