From cf580eaa0fb4f76baf805c198e53935c45804a10 Mon Sep 17 00:00:00 2001
From: McMassiveNZ <12842622+McMassiveNZ@users.noreply.github.com>
Date: Wed, 19 Jul 2023 22:27:09 +0200
Subject: [PATCH] update cmake modules dir

---
 CMakeLists.txt                          | 10 +++++-----
 cmake/{googletest.cmake => gtest.cmake} |  0
 test/CMakeLists.txt                     |  7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)
 rename cmake/{googletest.cmake => gtest.cmake} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8140ef3..aea8726 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,12 +13,12 @@ OPTION(ENABLE_WARNINGS_AS_ERRORS "Warnings are treated as Errors" ON)
 OPTION(ENABLE_STATIC_ANALYSIS "Enable Static Analysis Tools" OFF)
 OPTION(ENABLE_SANITIZERS "Enable Sanitizer Tools" OFF)
 
-set(CMAKE_SCRIPTS_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-include(${CMAKE_SCRIPTS_DIR}/compilerwarnings.cmake)
-include(${CMAKE_SCRIPTS_DIR}/sanitizers.cmake)
-include(${CMAKE_SCRIPTS_DIR}/staticanalysis.cmake)
-include(${CMAKE_SCRIPTS_DIR}/cpm.cmake)
+include(compilerwarnings)
+include(sanitizers)
+include(staticanalysis)
+include(cpm)
 
 if (ENABLE_TESTS)
     message("-- Unit Testing Enabled")
diff --git a/cmake/googletest.cmake b/cmake/gtest.cmake
similarity index 100%
rename from cmake/googletest.cmake
rename to cmake/gtest.cmake
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 773165f..af2db02 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,14 +1,15 @@
-include(${CMAKE_SCRIPTS_DIR}/googletest.cmake)
+include(gtest)
 set(current_target starter_window_test)
 
 add_executable(
   ${current_target}
-  test_main.cpp
+      test_main.cpp
 )
 
 target_link_libraries(
   ${current_target}
-  gtest_main
+  PRIVATE
+    gtest_main
 )
 
 include(GoogleTest)