Project restructure

CMakeLists.txt

@@ -8,6 +8,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 function(toAbsolutePath SETVAR PATHS)
+    set(PATHS ${PATHS} ${ARGN})
     set(RET_VAL "")
     foreach(FILE ${PATHS})
         get_filename_component(TMP
@@ -44,7 +45,6 @@ endif()
 if(NB_BUILD_TESTS)
     message(STATUS "Building tests")
     enable_testing()
-    set(GLFW_BUILD_TESTS ON CACHE BOOL "" FORCE)
     include(FetchContent)
     FetchContent_Declare(
         gtest
@@ -56,6 +56,7 @@ if(NB_BUILD_TESTS)
     endif()
     include(GoogleTest)
     set(GTEST_COLOR ON)
+    set(GLFW_BUILD_TESTS ON CACHE BOOL "" FORCE)
 endif()
 
 if (NB_LOGGING)
@@ -72,7 +73,6 @@ endif()
 # External Dep paths
 set(GLFW_PATH ../glfw/)
 set(GLAD_PATH ../glad/)
-
 get_filename_component(GLFW_PATH ${GLFW_PATH} ABSOLUTE)
 get_filename_component(GLAD_PATH ${GLAD_PATH} ABSOLUTE)
 

docs/CMakeLists.txt

@@ -20,7 +20,7 @@ if(NB_SOURCE_FILES)
     message("Using file timestamps...")
     doxygen_add_docs(NBEngineDocumentation
         ${NB_SOURCE_FILES} ${NB_INCLUDE_FILES}
-        USE_STAMP_FILE
+        USE_STAMP
         COMMENT "Building documentation"
     )
 else()

engine/CMakeLists.txt

@@ -14,4 +14,3 @@ if (NB_CORE_INCLUDE OR NB_EVENTS_INCLUDE OR NB_GRAPHICS_INCLUDE)
     list(APPEND NB_INCLUDE_FILES ${NB_CORE_INCLUDE} ${NB_GRAPHICS_INCLUDE} ${NB_EVENTS_INCLUDE})
     set(NB_INCLUDE_FILES ${NB_INCLUDE_FILES} PARENT_SCOPE)
 endif()
-message("${NB_INCLUDE_FILES}")

engine/NBCore/CMakeLists.txt

@@ -1,21 +1,21 @@
-include_directories(./.)
+include_directories(./include)
 
-toAbsolutePath(NB_CORE_SOURCE "
+toAbsolutePath(NB_CORE_SOURCE 
-    ./src/Errors.cpp;
+    ./src/Errors.cpp
-    ./src/Processes.cpp;
+    ./src/Processes.cpp
-    ./src/Logger.cpp;
+    ./src/Logger.cpp
-")
+)
 
-toAbsolutePath(NB_CORE_INCLUDE "
+toAbsolutePath(NB_CORE_INCLUDE
-    ANSITerm.hpp;
+    ./include/ANSITerm.hpp
-    DataSink.hpp;
+    ./include/DataSink.hpp
-    Errors.hpp;
+    ./include/Errors.hpp
-    Logger.hpp;
+    ./include/Logger.hpp
-    Processes.hpp;
+    ./include/Processes.hpp
-    ThreadsafeQueue.hpp;
+    ./include/ThreadsafeQueue.hpp
-    Types.hpp;
+    ./include/Types.hpp
-    TypeTraits.hpp;
+    ./include/TypeTraits.hpp
-")
+)
 
 set(NB_CORE_SOURCE ${NB_CORE_SOURCE} PARENT_SCOPE)
 set(NB_CORE_INCLUDE ${NB_CORE_INCLUDE} PARENT_SCOPE)

engine/NBCore/src/Errors.cpp

@@ -1,4 +1,5 @@
 #include "Errors.hpp"
+#gay
 
 namespace nb {
 

engine/NBEvents/CMakeLists.txt

@@ -5,7 +5,7 @@ toAbsolutePath(NB_EVENTS_SOURCE
 )
 
 toAbsolutePath(NB_EVENTS_INCLUDE
-    ./Events.hpp
+    ./include/Events.hpp
 )
 
 set(NB_EVENTS_SOURCE ${NB_EVENTS_SOURCE} PARENT_SCOPE)

engine/NBEvents/src/Events.cpp

@@ -1,4 +1,4 @@
-#include "Events.h"
+#include "Events.hpp"
 
 namespace NB {
 

engine/NBGraphics/CMakeLists.txt

@@ -16,13 +16,13 @@ toAbsolutePath(NB_GRAPHICS_SOURCE
 )
 
 toAbsolutePath(NB_GRAPHICS_INCLUDE
-    ./Buffers.hpp
+    ./include/Buffers.hpp
-    ./Camera.hpp
+    ./include/Camera.hpp
-    ./Draw.hpp
+    ./include/Draw.hpp
-    ./GLLoad.hpp
+    ./include/GLLoad.hpp
-    ./shader.hpp
+    ./include/shader.hpp
-    ./VAOManager.hpp
+    ./include/VAOManager.hpp
-    ./Window.hpp
+    ./include/Window.hpp
 )
 
 set(NB_GRAPHICS_SOURCE ${NB_GRAPHICS_SOURCE} PARENT_SCOPE)