From 21545ff51cd4775e2b0c515028b16339bfea0261 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Sun, 5 Sep 2021 11:29:54 +0100
Subject: [PATCH] make use of 'target_sources' to cleanup build scripts
---
fggl/CMakeLists.txt | 9 +--------
fggl/debug/CMakeLists.txt | 5 +++++
fggl/gfx/CMakeLists.txt | 10 ++++++++++
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/fggl/CMakeLists.txt b/fggl/CMakeLists.txt
index 18467d1..86599c8 100644
--- a/fggl/CMakeLists.txt
+++ b/fggl/CMakeLists.txt
@@ -2,14 +2,9 @@ configure_file(FgglConfig.h.in FgglConfig.h)
add_library(fggl fggl.cpp
ecs/ecs.cpp
- gfx/window.cpp
- gfx/renderer.cpp
- gfx/input.cpp
- gfx/shader.cpp
- gfx/ogl.cpp
data/model.cpp
data/procedural.cpp
- debug/debug.cpp)
+)
target_include_directories(fggl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../)
# Graphics backend
@@ -18,5 +13,3 @@ target_link_libraries(fggl glfw)
# Debug backend
add_subdirectory(debug)
-target_link_libraries(fggl imgui)
-
diff --git a/fggl/debug/CMakeLists.txt b/fggl/debug/CMakeLists.txt
index 139597f..50de25c 100644
--- a/fggl/debug/CMakeLists.txt
+++ b/fggl/debug/CMakeLists.txt
@@ -1,2 +1,7 @@
+target_sources(fggl
+ PRIVATE
+ debug.cpp
+)
+target_link_libraries(fggl imgui)
diff --git a/fggl/gfx/CMakeLists.txt b/fggl/gfx/CMakeLists.txt
index d2ff4af..9618578 100644
--- a/fggl/gfx/CMakeLists.txt
+++ b/fggl/gfx/CMakeLists.txt
@@ -1,4 +1,14 @@
+# Sources
+target_sources(fggl
+ PRIVATE
+ window.cpp
+ renderer.cpp
+ input.cpp
+ shader.cpp
+ ogl.cpp
+)
+
# OpenGL Backend
find_package( OpenGL REQUIRED )
include_directories( ${OPENGL_INCLUDE_DIR} )
--
GitLab