Update dependency management

This commit is contained in:
2023-11-28 09:28:11 +01:00
parent f83a56b17f
commit 03a9f219cc
11 changed files with 49 additions and 19 deletions

View File

@@ -3,10 +3,9 @@ if (NOT ANDROID AND NOT IOS)
add_subdirectory(glfw)
add_subdirectory(ftxui)
endif()
if (NOT LINUX)
add_subdirectory(fmt)
add_subdirectory(spdlog)
add_subdirectory(assimp)
endif()
#add_subdirectory(assimp)
add_subdirectory(yaml-cpp)
add_subdirectory(magic-enum)
add_subdirectory(pugixml)
@@ -16,6 +15,7 @@ add_subdirectory(utfcpp)
add_subdirectory(imgui)
add_subdirectory(tracy)
add_subdirectory(libstud-uuid)
add_subdirectory(rapidyaml)
if (NOT LINUX)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps)

View File

@@ -11,7 +11,7 @@ FetchContent_Declare(
GIT_TAG master
GIT_SHALLOW TRUE
)
set(EIGEN_BUILD_DOC OFF)
set(BUILD_TESTING OFF)
set(EIGEN_BUILD_PKGCONFIG OFF)
set(EIGEN_BUILD_DOC OFF CACHE BOOL "" FORCE)
set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
set(EIGEN_BUILD_PKGCONFIG OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(eigen)

14
3rdParty/fmt/CMakeLists.txt vendored Normal file
View File

@@ -0,0 +1,14 @@
include(FetchContent)
if(NOT DEFINED FMT_REPO)
set(FMT_REPO https://github.com/fmtlib/fmt)
endif ()
FetchContent_Declare(
fmt
EXCLUDE_FROM_ALL
GIT_REPOSITORY ${FMT_REPO}
GIT_TAG 10.1.0
GIT_SHALLOW TRUE
)
FetchContent_MakeAvailable(fmt)

View File

@@ -11,6 +11,6 @@ FetchContent_Declare(
GIT_TAG 3.3.8
GIT_SHALLOW TRUE
)
set(GLFW_BUILD_EXAMPLES OFF)
set(GLFW_BUILD_TESTS OFF)
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(glfw)

View File

@@ -11,5 +11,5 @@ FetchContent_Declare(
GIT_TAG 0.9.9.8
GIT_SHALLOW TRUE
)
set(GLM_TEST_ENABLE OFF)
set(GLM_TEST_ENABLE OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(glm)

View File

@@ -1,4 +1,5 @@
Find_Package(OpenCV)
include(FetchContent)
if(NOT DEFINED OPENCV_REPO)
set(OPENCV_REPO https://github.com/opencv/opencv.git)

View File

@@ -11,6 +11,6 @@ FetchContent_Declare(
GIT_TAG v1.14
GIT_SHALLOW TRUE
)
set(BUILD_SHARED_LIBS OFF)
set(PUGIXML_BUILD_TESTS OFF)
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
set(PUGIXML_BUILD_TESTS OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(pugixml)

14
3rdParty/rapidyaml/CMakeLists.txt vendored Normal file
View File

@@ -0,0 +1,14 @@
include(FetchContent)
if(NOT DEFINED RAPIDYAML_REPO)
set(RAPIDYAML_REPO https://github.com/biojppm/rapidyaml.git)
endif ()
FetchContent_Declare(
ryml
EXCLUDE_FROM_ALL
GIT_REPOSITORY ${RAPIDYAML_REPO}
GIT_TAG v0.6.0
GIT_SHALLOW FALSE # ensure submodules are checked out
)
FetchContent_MakeAvailable(ryml)

View File

@@ -8,8 +8,9 @@ FetchContent_Declare(
spdlog
EXCLUDE_FROM_ALL
GIT_REPOSITORY ${SPDLOG_REPO}
GIT_TAG v1.10.0
GIT_TAG v1.12.0
GIT_SHALLOW TRUE
)
option(SPDLOG_FMT_EXTERNAL "" ON)
FetchContent_MakeAvailable(spdlog)
#add_definitions(-SPDLOG_FMT_EXTERNAL)
#add_definitions(-DSPDLOG_FMT_EXTERNAL)

View File

@@ -11,7 +11,7 @@ FetchContent_Declare(
GIT_TAG v4.0.1
GIT_SHALLOW TRUE
)
set(UTF8_TESTS OFF)
set(UTF8_INSTALL OFF)
set(UTF8_SAMPLES OFF)
set(UTF8_TESTS OFF CACHE BOOL "" FORCE)
set(UTF8_INSTALL OFF CACHE BOOL "" FORCE)
set(UTF8_SAMPLES OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(utfcpp)

View File

@@ -11,6 +11,6 @@ FetchContent_Declare(
GIT_TAG 0.8.0
GIT_SHALLOW TRUE
)
set(YAML_CPP_BUILD_TOOLS OFF)
set(YAML_CPP_BUILD_TESTS OFF)
set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(yaml-cpp)