From 158f02c08e8208748e0e85eea835d7d7870a4c4b Mon Sep 17 00:00:00 2001 From: crane Date: Sun, 2 Apr 2023 21:13:30 -0700 Subject: [PATCH 1/3] fixing CMake error when glad was also used by another library --- deps/glad/src/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/deps/glad/src/CMakeLists.txt b/deps/glad/src/CMakeLists.txt index 6c1a27f0..9d1d6476 100644 --- a/deps/glad/src/CMakeLists.txt +++ b/deps/glad/src/CMakeLists.txt @@ -1,10 +1,12 @@ cmake_minimum_required(VERSION 3.1) # Create a library for the viewer code -add_library( - glad - glad.c - ) +if (NOT TARGET glad) + add_library( + glad + glad.c + ) +endif() # Are we building a shared library? get_target_property(library_type glad TYPE) From ff4fba758b38198c401602950b51df4c1e04c7e1 Mon Sep 17 00:00:00 2001 From: crane Date: Sun, 2 Apr 2023 21:16:00 -0700 Subject: [PATCH 2/3] fixing CMake error when glfw was also used by another library --- deps/glfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/glfw b/deps/glfw index 7d5a16ce..9d1af399 160000 --- a/deps/glfw +++ b/deps/glfw @@ -1 +1 @@ -Subproject commit 7d5a16ce714f0b5f4efa3262de22e4d948851525 +Subproject commit 9d1af3991dc48c80be811704cb2777fe555aa48b From 18dde8aed324ce1c4b979b5510776933ee9ce4d9 Mon Sep 17 00:00:00 2001 From: crane Date: Sun, 2 Apr 2023 22:53:37 -0700 Subject: [PATCH 3/3] Revert "fixing CMake error when glfw was also used by another library" This reverts commit ff4fba758b38198c401602950b51df4c1e04c7e1. --- deps/glfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/glfw b/deps/glfw index 9d1af399..7d5a16ce 160000 --- a/deps/glfw +++ b/deps/glfw @@ -1 +1 @@ -Subproject commit 9d1af3991dc48c80be811704cb2777fe555aa48b +Subproject commit 7d5a16ce714f0b5f4efa3262de22e4d948851525