CMake Target Include Directory improvement attempt

MathewBensonCode · MathewBensonCode · commit 61fabec7953a · 2025-07-22T09:53:02.000+03:00
diff --git a/Tetragrama/CMakeLists.txt b/Tetragrama/CMakeLists.txt
@@ -6,9 +6,6 @@ project (Tetragrama
 	LANGUAGES CXX
 )
 
-set (CMAKE_CXX_STANDARD_REQUIRED ON)
-set	(CMAKE_CXX_STANDARD 20)
-
 file (GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
 file (GLOB_RECURSE CPP_FILES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
@@ -40,17 +37,6 @@ include(${EXTERNAL_DIR}/externals.cmake)
 target_include_directories (${TARGET_NAME}
 	PRIVATE
         .
-        ./Components
-        ./Components/Events
-        ./Controllers
-        ./Inputs
-        ./Layers
-        ./Messengers
-        ./Helpers
-        ./Importers
-        ./Serializers
-        ./Managers
-		${ENLISTMENT_ROOT}/ZEngine
 )
 
 target_precompile_headers(${TARGET_NAME} PRIVATE pch.h)
diff --git a/ZEngine/CMakeLists.txt b/ZEngine/CMakeLists.txt
@@ -6,18 +6,5 @@ project (ZEngine
 	LANGUAGES CXX C
 )
 
-# Compiler verification in Linux
-#
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-	if ((NOT ${CMAKE_CXX_COMPILER_VERSION} MATCHES "11.*.*") AND (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"))
-		message(FATAL_ERROR "CLANG compiler version should be 11.*.* !")
-	elseif ((NOT ${CMAKE_CXX_COMPILER_VERSION} MATCHES "11.*.*") AND (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU"))
-		message(FATAL_ERROR "GNU compiler version should be 11.*.* !")
-	endif ()
-endif ()
-
-set (CMAKE_CXX_STANDARD_REQUIRED ON)
-set	(CMAKE_CXX_STANDARD 20)
-
 add_subdirectory (ZEngine)
-add_subdirectory (tests)
+add_subdirectory (tests)
diff --git a/ZEngine/ZEngine/CMakeLists.txt b/ZEngine/ZEngine/CMakeLists.txt
@@ -18,40 +18,10 @@ target_sources(zEngineLib
 )
 
 target_include_directories (zEngineLib
-	PUBLIC
-		.
-		./Core
-		./Core/Maths
-		./Core/Memory
-		./Core/Containers
-		./Hardwares
-		./Helpers
-		./Layers
-		./Logging
-		./Rendering
-		./Rendering/Entities
-		./Rendering/Meshes
-		./Rendering/Buffers
-		./Rendering/Cameras
-		./Rendering/Pools
-		./Rendering/Primitives
-		./Rendering/Renderers
-		./Rendering/Renderers/Pipelines
-		./Rendering/Renderers/RenderPasses
-		./Rendering/Renderers/Storages
-		./Rendering/Scenes
-		./Rendering/Shaders
-		./Rendering/Shaders/Compilers
-		./Rendering/Specifications
-		./Rendering/Textures
-		./Windows
-		./Windows/Events
-		./Windows/Inputs
-		./Windows/Layers
-		./Managers
-		./Serializers
-		${EXTERNAL_DIR}
-		${EXTERNAL_INCLUDE_DIRS}
+    PRIVATE
+        .
+    INTERFACE
+        ..
 )
 
 target_precompile_headers(zEngineLib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pch.h)
diff --git a/ZEngine/tests/Containers/array_test.cpp b/ZEngine/tests/Containers/array_test.cpp
@@ -1,4 +1,4 @@
-#include <Core/Containers/Array.h>
+#include <ZEngine/Core/Containers/Array.h>
 #include <gtest/gtest.h>
 
 using namespace ZEngine::Core::Containers;
@@ -134,4 +134,4 @@ TEST_F(ArrayTest, ArrayViewWrap)
 
     view[1] = 99;
     EXPECT_EQ(array[1], 99);
-}
+}
diff --git a/ZEngine/tests/Containers/hashmap_test.cpp b/ZEngine/tests/Containers/hashmap_test.cpp
@@ -1,5 +1,5 @@
-#include <Core/Containers/HashMap.h>
-#include <Core/Containers/Strings.h>
+#include <ZEngine/Core/Containers/HashMap.h>
+#include <ZEngine/Core/Containers/Strings.h>
 #include <gtest/gtest.h>
 #include <string>
 
@@ -258,4 +258,4 @@ TEST_F(HashMapTest, UserDefinedStructViewIterations)
     }
 
     EXPECT_EQ(matched_count, 3);
-}
+}
diff --git a/ZEngine/tests/Containers/initializerlist_test.cpp b/ZEngine/tests/Containers/initializerlist_test.cpp
@@ -1,6 +1,6 @@
-#include <Core/Containers/Array.h>
-#include <Core/Containers/InitializerList.h>
-#include <Core/Containers/Strings.h>
+#include <ZEngine/Core/Containers/Array.h>
+#include <ZEngine/Core/Containers/InitializerList.h>
+#include <ZEngine/Core/Containers/Strings.h>
 #include <gtest/gtest.h>
 
 using namespace ZEngine::Core::Containers;
diff --git a/ZEngine/tests/Containers/string_test.cpp b/ZEngine/tests/Containers/string_test.cpp
@@ -1,4 +1,4 @@
-#include <Core/Containers/Strings.h>
+#include <ZEngine/Core/Containers/Strings.h>
 #include <gtest/gtest.h>
 
 using namespace ZEngine::Core::Containers;
diff --git a/ZEngine/tests/Maths/Matrix_test.cpp b/ZEngine/tests/Maths/Matrix_test.cpp
@@ -1,5 +1,5 @@
-﻿#include <Core/Maths/Matrix.h>
-#include <Core/Maths/Quaternion.h>
+﻿#include <ZEngine/Core/Maths/Matrix.h>
+#include <ZEngine/Core/Maths/Quaternion.h>
 #include <gtest/gtest.h>
 
 using namespace ZEngine::Core::Maths;
diff --git a/ZEngine/tests/Maths/Vector_test.cpp b/ZEngine/tests/Maths/Vector_test.cpp
@@ -1,4 +1,4 @@
-#include <Core/Maths/Vec.h>
+#include <ZEngine/Core/Maths/Vec.h>
 #include <gtest/gtest.h>
 
 using namespace ZEngine::Core::Maths;
@@ -148,4 +148,4 @@ TEST(VectorTest, Normalized)
     EXPECT_NEAR(n.x, 0.6f, 1e-5f);
     EXPECT_NEAR(n.y, 0.8f, 1e-5f);
     EXPECT_NEAR(n.magnitude(), 1.0f, 1e-5f);
-}
+}
diff --git a/ZEngine/tests/Memory/IntrusivePtr_test.cpp b/ZEngine/tests/Memory/IntrusivePtr_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "Helpers/IntrusivePtr.h"
+#include <ZEngine/Helpers/IntrusivePtr.h>
 
 using namespace ZEngine::Helpers;
 
@@ -320,4 +320,4 @@ TEST(IntrusivePtrTest, BaseDerivedType)
     IntrusivePtr<MockObject>      intrusivePtr3 = make_intrusive<MockObject>(5);
     IntrusivePtr<MockObjectChild> intrusivePtr4 = make_intrusive<MockObjectChild>(5);
     intrusivePtr3                               = intrusivePtr4;
-}
+}
diff --git a/ZEngine/tests/Memory/IntrusiveWeakPtr_test.cpp b/ZEngine/tests/Memory/IntrusiveWeakPtr_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "Helpers/IntrusivePtr.h"
+#include <ZEngine/Helpers/IntrusivePtr.h>
 
 using namespace ZEngine::Helpers;
 
@@ -136,4 +136,4 @@ TEST(IntrusiveWeakPtrTest, BaseDerivedType)
     IntrusivePtr<MockWeakObject>     intrusivePtr3 = make_intrusive<MockObjectChild>(5);
     IntrusiveWeakPtr<MockWeakObject> intrusiveWeakPtr4;
     intrusiveWeakPtr4 = intrusivePtr3;
-}
+}
diff --git a/ZEngine/tests/Memory/MemoryOperation_test.cpp b/ZEngine/tests/Memory/MemoryOperation_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "Helpers/MemoryOperations.h"
+#include <ZEngine/Helpers/MemoryOperations.h>
 
 using namespace ZEngine::Helpers;
 
diff --git a/ZEngine/tests/Memory/allocator_test.cpp b/ZEngine/tests/Memory/allocator_test.cpp
@@ -1,6 +1,6 @@
-#include <Core/Memory/Allocator.h>
-#include <Core/Memory/MemoryManager.h>
-#include <Helpers/MemoryOperations.h>
+#include <ZEngine/Core/Memory/Allocator.h>
+#include <ZEngine/Core/Memory/MemoryManager.h>
+#include <ZEngine/Helpers/MemoryOperations.h>
 #include <gtest/gtest.h>
 
 using namespace ZEngine;
diff --git a/ZEngine/tests/Memory/bitmap_test.cpp b/ZEngine/tests/Memory/bitmap_test.cpp
@@ -1,4 +1,4 @@
-#include <Rendering/Buffers/Bitmap.h>
+#include <ZEngine/Rendering/Buffers/Bitmap.h>
 #include <gtest/gtest.h>
 #include <stb/stb_image.h>
 #include <stb/stb_image_write.h>
@@ -87,4 +87,4 @@ TEST(BitmapTest, TestVerticalCross2)
 
     EXPECT_TRUE(std::filesystem::exists(current_path + "/screenshot3.hdr"));
     EXPECT_TRUE(std::filesystem::exists(current_path + "/screenshot4.hdr"));
-}
+}
diff --git a/ZEngine/tests/Memory/handleManager_test.cpp b/ZEngine/tests/Memory/handleManager_test.cpp
@@ -1,6 +1,6 @@
-#include <Core/Memory/Allocator.h>
-#include <Core/Memory/MemoryManager.h>
-#include <Helpers/HandleManager.h>
+#include <ZEngine/Core/Memory/Allocator.h>
+#include <ZEngine/Core/Memory/MemoryManager.h>
+#include <ZEngine/Helpers/HandleManager.h>
 #include <gtest/gtest.h>
 #include <thread>
 
@@ -145,4 +145,4 @@ TEST_F(HandleManagerTest, ConcurrentAccess)
     {
         thread.join();
     }
-}
+}
diff --git a/ZEngine/tests/Misc/ThreadPool_test.cpp b/ZEngine/tests/Misc/ThreadPool_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "Helpers/ThreadPool.h"
+#include <ZEngine/Helpers/ThreadPool.h>
 
 using namespace ZEngine::Helpers;
 
diff --git a/ZEngine/tests/Misc/shaderCompiler_test.cpp b/ZEngine/tests/Misc/shaderCompiler_test.cpp
@@ -1,4 +1,4 @@
-#include <Rendering/Shaders/Compilers/ShaderCompiler.h>
+#include <ZEngine/Rendering/Shaders/Compilers/ShaderCompiler.h>
 #include <gtest/gtest.h>
 #include <filesystem>
 #include <iostream>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <Core/Containers/Strings.h>`
	`1`	`+#include <ZEngine/Core/Containers/Strings.h>`
`2`	`2`	`#include <gtest/gtest.h>`
`3`	`3`
`4`	`4`	`using namespace ZEngine::Core::Containers;`