download to common source directory

This commit is contained in:
jadebenn 2024-11-23 14:54:43 -08:00
parent 6f82606e21
commit b16785441e
3 changed files with 12 additions and 6 deletions

3
.gitignore vendored
View File

@ -6,6 +6,9 @@ docker/configs
# Third party libraries # Third party libraries
thirdparty/mysql/ thirdparty/mysql/
thirdparty/mysql_linux/ thirdparty/mysql_linux/
thirdparty/backtrace/
thirdparty/magic_enum/
thirdparty/tinyxml2/
CMakeVariables.txt CMakeVariables.txt
# Build folders # Build folders

View File

@ -110,26 +110,34 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
find_package(MariaDB) find_package(MariaDB)
# Fetch third party dependencies # Fetch third party dependencies
set(DLU_THIRDPARTY_SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty)
include(FetchContent) include(FetchContent)
FetchContent_Declare( FetchContent_Declare(
backtrace backtrace
SYSTEM SYSTEM
SOURCE_DIR ${DLU_THIRDPARTY_SOURCE_DIR}/backtrace
GIT_REPOSITORY https://github.com/ianlancetaylor/libbacktrace.git GIT_REPOSITORY https://github.com/ianlancetaylor/libbacktrace.git
) )
FetchContent_Declare( FetchContent_Declare(
magic_enum magic_enum
SYSTEM SYSTEM
SOURCE_DIR ${DLU_THIRDPARTY_SOURCE_DIR}/magic_enum
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( FetchContent_Declare(
tinyxml2 tinyxml2
SYSTEM SYSTEM
SOURCE_DIR ${DLU_THIRDPARTY_SOURCE_DIR}/tinyxml2
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 tinyxml2)
# Turn off tinyxml2 testing
set(tinyxml2_BUILD_TESTING OFF)
include(CMakePrintHelpers) include(CMakePrintHelpers)
cmake_print_properties(TARGETS magic_enum tinyxml2 PROPERTIES cmake_print_properties(TARGETS magic_enum tinyxml2 PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES) INTERFACE_INCLUDE_DIRECTORIES)
@ -276,9 +284,7 @@ include_directories(
"tests/dGameTests/dComponentsTests" "tests/dGameTests/dComponentsTests"
SYSTEM SYSTEM
# "thirdparty/magic_enum/include/magic_enum"
"thirdparty/raknet/Source" "thirdparty/raknet/Source"
# "thirdparty/tinyxml2"
"thirdparty/recastnavigation" "thirdparty/recastnavigation"
"thirdparty/SQLite" "thirdparty/SQLite"
"thirdparty/cpplinq" "thirdparty/cpplinq"
@ -297,7 +303,7 @@ if(MSVC)
# add_compile_options("/W4") # add_compile_options("/W4")
# Want to enable warnings eventually, but WAY too much noise right now # Want to enable warnings eventually, but WAY too much noise right now
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU") elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
add_compile_options("-Wuninitialized" "-Wold-style-cast") add_compile_options("-Wuninitialized" "-Wold-style-cast" "-Wstrict-aliasing")
else() else()
message(WARNING "Unknown compiler: '${CMAKE_CXX_COMPILER_ID}' - No warning flags enabled.") message(WARNING "Unknown compiler: '${CMAKE_CXX_COMPILER_ID}' - No warning flags enabled.")
endif() endif()

View File

@ -1,9 +1,6 @@
# Source Code for recast # Source Code for recast
add_subdirectory(recastnavigation) add_subdirectory(recastnavigation)
# Turn off tinyxml2 testing
set(tinyxml2_BUILD_TESTING OFF)
# 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(
GLOB SOURCES_LIBBCRYPT GLOB SOURCES_LIBBCRYPT