Skip to content

Commit

Permalink
switch recast to using fetchcontent
Browse files Browse the repository at this point in the history
  • Loading branch information
jadebenn committed Nov 27, 2024
1 parent fd30002 commit 764bf43
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ thirdparty/mysql/
thirdparty/mysql_linux/
thirdparty/backtrace/
thirdparty/magic_enum/
thirdparty/recastnavigation/
thirdparty/tinyxml2/
CMakeVariables.txt

Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "thirdparty/cpp-httplib"]
path = thirdparty/cpp-httplib
url = https://github.com/yhirose/cpp-httplib
[submodule "thirdparty/recastnavigation"]
path = thirdparty/recastnavigation
url = https://github.com/recastnavigation/recastnavigation
[submodule "thirdparty/libbcrypt"]
path = thirdparty/libbcrypt
url = https://github.com/trusch/libbcrypt.git
Expand Down
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,27 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/Neargye/magic_enum.git
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(
tinyxml2
SYSTEM
SOURCE_DIR ${DLU_THIRDPARTY_SOURCE_DIR}/tinyxml2
GIT_REPOSITORY https://github.com/leethomason/tinyxml2.git
GIT_TAG 9.0.0
)
FetchContent_MakeAvailable(magic_enum tinyxml2)
FetchContent_MakeAvailable(magic_enum Recast tinyxml2)

# Turn off tinyxml2 testing
set(tinyxml2_BUILD_TESTING OFF)

include(CMakePrintHelpers)
cmake_print_properties(TARGETS magic_enum tinyxml2 PROPERTIES
cmake_print_properties(TARGETS magic_enum Recast tinyxml2 PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES)

# Create a /resServer directory
Expand Down Expand Up @@ -292,7 +299,6 @@ include_directories(

SYSTEM
"thirdparty/raknet/Source"
"thirdparty/recastnavigation"
"thirdparty/SQLite"
"thirdparty/cpplinq"
"thirdparty/cpp-httplib"
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 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.
# file(
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/recastnavigation
Submodule recastnavigation updated from c5cbd5 to 6dc166

0 comments on commit 764bf43

Please sign in to comment.