From dded47f921b7bcad28d2d7a48faec90281e2fa99 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Fri, 3 Apr 2020 02:00:51 +0100
Subject: [PATCH] Cleanup

---
 CMakeLists.txt               | 2 +-
 DoConfig/CMakeLists.txt      | 7 ++-----
 external/glad/CMakeLists.txt | 4 ++++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e79bed7..aa45c715 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -530,7 +530,7 @@ if(BACKEND_RENDERER MATCHES "OpenGL3")
 	target_link_libraries(CSE2 PRIVATE glad)
 
 	find_package(OpenGL REQUIRED)
-	target_link_libraries(CSE2 PRIVATE OpenGL::GL ${CMAKE_DL_LIBS})
+	target_link_libraries(CSE2 PRIVATE OpenGL::GL)
 endif()
 
 if(BACKEND_RENDERER MATCHES "OpenGLES2")
diff --git a/DoConfig/CMakeLists.txt b/DoConfig/CMakeLists.txt
index b7636f48..1d23ce30 100644
--- a/DoConfig/CMakeLists.txt
+++ b/DoConfig/CMakeLists.txt
@@ -70,14 +70,11 @@ endif()
 
 # glad
 
-if(NOT TARGET glad)
-	add_subdirectory("../external/glad" "glad" EXCLUDE_FROM_ALL)
-endif()
-
+add_subdirectory("../external/glad" "glad" EXCLUDE_FROM_ALL)
 target_link_libraries(DoConfig PRIVATE glad)
 
 find_package(OpenGL REQUIRED)
-target_link_libraries(DoConfig PRIVATE OpenGL::GL ${CMAKE_DL_LIBS})
+target_link_libraries(DoConfig PRIVATE OpenGL::GL)
 
 # GLFW3
 
diff --git a/external/glad/CMakeLists.txt b/external/glad/CMakeLists.txt
index 56b8523e..e67a755f 100644
--- a/external/glad/CMakeLists.txt
+++ b/external/glad/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.12)
 
+if(NOT TARGET glad)
+
 project(glad LANGUAGES C)
 
 add_library(glad
@@ -10,3 +12,5 @@ add_library(glad
 
 target_include_directories(glad PUBLIC "include")
 target_link_libraries(glad PRIVATE ${CMAKE_DL_LIBS})
+
+endif(NOT TARGET glad)