diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5bac96..8f60158 100644
--- a/CMakeLists.txt
+++ b/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)
 
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index d830375..f6c8141 100644
--- a/docs/CMakeLists.txt
+++ b/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()
diff --git a/engine/NBCore/CMakeLists.txt b/engine/NBCore/CMakeLists.txt
index a609519..d9d8436 100644
--- a/engine/NBCore/CMakeLists.txt
+++ b/engine/NBCore/CMakeLists.txt
@@ -1,21 +1,21 @@
 include_directories(./.)
 
-toAbsolutePath(NB_CORE_SOURCE "
-    ./src/Errors.cpp;
-    ./src/Processes.cpp;
-    ./src/Logger.cpp;
-")
+toAbsolutePath(NB_CORE_SOURCE 
+    ./src/Errors.cpp
+    ./src/Processes.cpp
+    ./src/Logger.cpp
+)
 
-toAbsolutePath(NB_CORE_INCLUDE "
-    ANSITerm.hpp;
-    DataSink.hpp;
-    Errors.hpp;
-    Logger.hpp;
-    Processes.hpp;
-    ThreadsafeQueue.hpp;
-    Types.hpp;
-    TypeTraits.hpp;
-")
+toAbsolutePath(NB_CORE_INCLUDE
+    ANSITerm.hpp
+    DataSink.hpp
+    Errors.hpp
+    Logger.hpp
+    Processes.hpp
+    ThreadsafeQueue.hpp
+    Types.hpp
+    TypeTraits.hpp
+)
 
 set(NB_CORE_SOURCE ${NB_CORE_SOURCE} PARENT_SCOPE)
 set(NB_CORE_INCLUDE ${NB_CORE_INCLUDE} PARENT_SCOPE)