Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-07-03 18:19:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch recast to using fetchcontent

Browse Source
This commit is contained in:
jadebenn 2024-11-26 22:37:40 -06:00
parent fd300027a8
commit 764bf43778
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,6 +8,7 @@ thirdparty/mysql/
thirdparty/mysql_linux/ thirdparty/mysql_linux/
thirdparty/backtrace/ thirdparty/backtrace/
thirdparty/magic_enum/ thirdparty/magic_enum/
thirdparty/recastnavigation/
thirdparty/tinyxml2/ thirdparty/tinyxml2/
CMakeVariables.txt CMakeVariables.txt

3
.gitmodules vendored
View File

@ -1,9 +1,6 @@
[submodule "thirdparty/cpp-httplib"] [submodule "thirdparty/cpp-httplib"]
path = thirdparty/cpp-httplib path = thirdparty/cpp-httplib
url = https://github.com/yhirose/cpp-httplib url = https://github.com/yhirose/cpp-httplib
[submodule "thirdparty/recastnavigation"]
path = thirdparty/recastnavigation
url = https://github.com/recastnavigation/recastnavigation
[submodule "thirdparty/libbcrypt"] [submodule "thirdparty/libbcrypt"]
path = thirdparty/libbcrypt path = thirdparty/libbcrypt
url = https://github.com/trusch/libbcrypt.git url = https://github.com/trusch/libbcrypt.git

12
CMakeLists.txt
View File

@ -133,6 +133,13 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/Neargye/magic_enum.git GIT_REPOSITORY https://github.com/Neargye/magic_enum.git
GIT_TAG v0.9.7 GIT_TAG v0.9.7
) )
FetchContent_Declare(
Recast
SYSTEM
SOURCE_DIR ${DLU_THIRDPARTY_SOURCE_DIR}/recastnavigation
GIT_REPOSITORY https://github.com/recastnavigation/recastnavigation
GIT_TAG v1.6.0
)
FetchContent_Declare( FetchContent_Declare(
tinyxml2 tinyxml2
SYSTEM SYSTEM
@ -140,13 +147,13 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/leethomason/tinyxml2.git GIT_REPOSITORY https://github.com/leethomason/tinyxml2.git
GIT_TAG 9.0.0 GIT_TAG 9.0.0
) )
FetchContent_MakeAvailable(magic_enum tinyxml2) FetchContent_MakeAvailable(magic_enum Recast tinyxml2)
# Turn off tinyxml2 testing # Turn off tinyxml2 testing
set(tinyxml2_BUILD_TESTING OFF) set(tinyxml2_BUILD_TESTING OFF)
include(CMakePrintHelpers) include(CMakePrintHelpers)
cmake_print_properties(TARGETS magic_enum tinyxml2 PROPERTIES cmake_print_properties(TARGETS magic_enum Recast tinyxml2 PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES) INTERFACE_INCLUDE_DIRECTORIES)
# Create a /resServer directory # Create a /resServer directory
@ -292,7 +299,6 @@ include_directories(
SYSTEM SYSTEM
"thirdparty/raknet/Source" "thirdparty/raknet/Source"
"thirdparty/recastnavigation"
"thirdparty/SQLite" "thirdparty/SQLite"
"thirdparty/cpplinq" "thirdparty/cpplinq"
"thirdparty/cpp-httplib" "thirdparty/cpp-httplib"

2
thirdparty/CMakeLists.txt vendored
View File

@ -1,5 +1,5 @@
# Source Code for recast # Source Code for recast
add_subdirectory(recastnavigation) # add_subdirectory(recastnavigation)
# Source Code for libbcrypt. Uses a file glob instead to get around Windows build issues. # Source Code for libbcrypt. Uses a file glob instead to get around Windows build issues.
# file( # file(

2
thirdparty/recastnavigation vendored

@ -1 +1 @@
Subproject commit c5cbd53024c8a9d8d097a4371215e3342d2fdc87 Subproject commit 6dc1667f580357e8a2154c28b7867bea7e8ad3a7