From d8fac5917e1b86c0fea42c723013f9136aceb4c5 Mon Sep 17 00:00:00 2001 From: Derek Christ Date: Sun, 4 Jun 2023 00:19:04 +0200 Subject: [PATCH] Switch from Git Submodules to CMake FetchContent --- .gitmodules | 12 ------------ CMakeLists.txt | 30 ++++++++++++++++++++++++++++-- lib/CMakeLists.txt | 10 ---------- lib/entt | 1 - lib/fx-gltf | 1 - lib/glfw | 1 - src/CMakeLists.txt | 1 - 7 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 .gitmodules delete mode 160000 lib/entt delete mode 160000 lib/fx-gltf delete mode 160000 lib/glfw diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index eef78f6..0000000 --- a/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule "lib/spdlog"] - path = lib/spdlog - url = git@github.com:gabime/spdlog.git -[submodule "lib/entt"] - path = lib/entt - url = https://github.com/skypjack/entt.git -[submodule "lib/glfw"] - path = lib/glfw - url = https://github.com/glfw/glfw.git -[submodule "lib/fx-gltf"] - path = lib/fx-gltf - url = https://github.com/jessey-git/fx-gltf.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c3fd7c3..fdfe68a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,8 +12,34 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) include(FetchContent) -FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz) -FetchContent_MakeAvailable(json) +# EnTT +FetchContent_Declare( + entt + URL https://github.com/skypjack/entt/archive/refs/tags/v3.11.1.tar.gz +) + +FetchContent_MakeAvailable(entt) + +# GLFW +FetchContent_Declare( + glfw + URL https://github.com/glfw/glfw/releases/download/3.3.8/glfw-3.3.8.zip +) + +option(GLFW_BUILD_DOCS "" OFF) +option(GLFW_INSTALL "" OFF) +FetchContent_MakeAvailable(glfw) + + +# fx-gltf +FetchContent_Declare( + fx-gltf + URL https://github.com/jessey-git/fx-gltf/archive/refs/tags/v2.0.0.tar.gz +) + +option(FX_GLTF_BUILD_TESTS "" OFF) +option(FX_GLTF_INSTALL "" OFF) +FetchContent_MakeAvailable(fx-gltf) find_package(glm REQUIRED) find_package(spdlog REQUIRED) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 900e726..657e810 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,12 +1,2 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glad) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/entt) - -option(GLFW_BUILD_DOCS "" OFF) -option(GLFW_INSTALL "" OFF) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glfw) - -option(FX_GLTF_BUILD_TESTS "" OFF) -option(FX_GLTF_INSTALL "" OFF) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/fx-gltf) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/stb) diff --git a/lib/entt b/lib/entt deleted file mode 160000 index de0e586..0000000 --- a/lib/entt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit de0e5862dd02fa669325a0a06b7936af4d2a841d diff --git a/lib/fx-gltf b/lib/fx-gltf deleted file mode 160000 index 7766c23..0000000 --- a/lib/fx-gltf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7766c237ea81c0bb3759e78e5c0f22854843eef8 diff --git a/lib/glfw b/lib/glfw deleted file mode 160000 index dd8a678..0000000 --- a/lib/glfw +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dd8a678a66f1967372e5a5e3deac41ebf65ee127 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 30c6416..7bf57c5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,7 +29,6 @@ target_link_libraries( pthread spdlog fx-gltf::fx-gltf - nlohmann_json::nlohmann_json stb )