From 6d317cf89c88cb5a9d29b2ddfc50a5380b1f1fb4 Mon Sep 17 00:00:00 2001 From: McMassiveNZ <12842622+McMassiveNZ@users.noreply.github.com> Date: Wed, 19 Jul 2023 22:18:18 +0200 Subject: [PATCH] update cmake modules dir --- CMakeLists.txt | 10 +++++----- cmake/{googletest.cmake => gtest.cmake} | 0 test/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename cmake/{googletest.cmake => gtest.cmake} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a0e5b18..5edb893 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" ON) OPTION(ENABLE_SANITIZERS "Enable Sanitizer Tools" ON) -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 c68308a..ef065fb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -include(${CMAKE_SCRIPTS_DIR}/googletest.cmake) +include(gtest) add_executable( blank-slate-test