From 0225fb8e5d0c9400cc563d8eb242b204a9225143 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sat, 3 Aug 2024 12:24:22 -0500
Subject: [PATCH] updated build system

---
 CMakeLists.txt        |  4 ++--
 cmake/functions.cmake | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c731fd5c..2e727338 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,9 +63,9 @@ if(PROJECT_BUILD)
   endif()
 
   file(GLOB_RECURSE ADDITIONAL_SOURCES 
-    ${PROJECT_3RD_PARTY_DIR}/src/*.c
-    ${PROJECT_3RD_PARTY_DIR}/src/*.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/version.cpp
+    ${PROJECT_SUPPORT_DIR}/src/*.c
+    ${PROJECT_SUPPORT_DIR}/src/*.cpp
   )
 
   list(APPEND PROJECT_ADDITIONAL_SOURCES
diff --git a/cmake/functions.cmake b/cmake/functions.cmake
index 0db385c9..5da081f2 100644
--- a/cmake/functions.cmake
+++ b/cmake/functions.cmake
@@ -105,20 +105,20 @@ function(add_project_test_executable name dependencies libraries)
     enable_testing()
 
     file(GLOB_RECURSE headers
-      ${PROJECT_SUPPORT_DIR}/test/include/*.hpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/${name}/include/${name}/include/*.hxx
+      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/${name}/include/*.hpp
       ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.h
       ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.hh
-      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/${name}/include/*.hpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/${name}/include/${name}/include/*.hxx
+      ${PROJECT_SUPPORT_DIR}/test/include/*.hpp
     )
 
     file(GLOB_RECURSE sources
-      ${PROJECT_SUPPORT_DIR}/test/src/*.cpp
-      ${additional_sources}
       ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.c
       ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cc
       ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cxx
+      ${PROJECT_SUPPORT_DIR}/test/src/*.cpp
+      ${additional_sources}
     )
 
     add_project_executable2(${name} "${dependencies}" "${libraries}" "${headers}" "${sources}")