From 7b4e430cbb820163e9d9cbc09dbf00b1bfb75aec Mon Sep 17 00:00:00 2001 From: Tri11Paragon Date: Thu, 31 Oct 2024 20:59:49 -0700 Subject: [PATCH] fetch content for glfw --- .idea/editor.xml | 483 ++++++++++++++++++++++++++++++++++++++++++ .idea/misc.xml | 3 + CMakeLists.txt | 15 +- libraries/BLT | 2 +- libraries/imgui | 2 +- libraries/openal-soft | 2 +- 6 files changed, 503 insertions(+), 4 deletions(-) create mode 100644 .idea/editor.xml diff --git a/.idea/editor.xml b/.idea/editor.xml new file mode 100644 index 0000000..b0d69ef --- /dev/null +++ b/.idea/editor.xml @@ -0,0 +1,483 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 79b3c94..0b76fe5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,7 @@ + + \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index fd4a722..0861d37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.25) +include(FetchContent) set(BLT_GRAPHICS_VERSION 0.13.37) set(BLT_GRAPHICS_TEST_VERSION 0.0.1) @@ -24,7 +25,19 @@ else () set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE) set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) - find_package(glfw3 REQUIRED) + find_package(glfw3) + + if (NOT GLFW_FOUND) + message("Downloading GLFW") + FetchContent_Declare( + glfw_git + GIT_REPOSITORY https://github.com/glfw/glfw.git + GIT_TAG 7b6aead9fb88b3623e3b3725ebb42670cbe4c579 # Release 3.4 + ) + FetchContent_MakeAvailable(glfw_git) + + endif () + find_package(OpenGL REQUIRED) add_subdirectory(libraries/openal-soft) endif () diff --git a/libraries/BLT b/libraries/BLT index e81f590..ea16aa3 160000 --- a/libraries/BLT +++ b/libraries/BLT @@ -1 +1 @@ -Subproject commit e81f590f5e4f8c79ec99307fcf7d7cbbfcc83217 +Subproject commit ea16aa384747fa66abf234f0156981f6b736c929 diff --git a/libraries/imgui b/libraries/imgui index ccb6646..71c77c0 160000 --- a/libraries/imgui +++ b/libraries/imgui @@ -1 +1 @@ -Subproject commit ccb6646baeac88d276078ebade5616f4c6d7c03a +Subproject commit 71c77c081ac36841e682498229088e7678207112 diff --git a/libraries/openal-soft b/libraries/openal-soft index c2a15a0..ebd2f0f 160000 --- a/libraries/openal-soft +++ b/libraries/openal-soft @@ -1 +1 @@ -Subproject commit c2a15a0c7c5ec8dc774b110de1cbe54b26fe0c3f +Subproject commit ebd2f0f1543186c4b33403c390171d01ee15542e