From 07f1e8d7d76efacc63f2dc3b8a943f470840ed98 Mon Sep 17 00:00:00 2001
From: Emily Boudreaux <thomas@boudreauxmail.com>
Date: Sun, 22 Jun 2025 04:52:04 -0400
Subject: [PATCH] fix(headers): moved all headers to fourdst/

---
 meson.build                                          |  2 +-
 .../{public => include/fourdst/config}/config.h      |  0
 src/config/{private => lib}/config.cpp               |  2 +-
 src/config/meson.build                               | 12 ++++++------
 tests/config/configTest.cpp                          |  3 ++-
 tests/config/meson.build                             |  1 -
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename src/config/{public => include/fourdst/config}/config.h (100%)
 rename src/config/{private => lib}/config.cpp (98%)

diff --git a/meson.build b/meson.build
index dcdc057..fd7f1ec 100644
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,7 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 # *********************************************************************** #
-project('libconfig', 'cpp', version: 'v1.0.3', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
+project('libconfig', 'cpp', version: 'v1.0.6', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
 
 # Add default visibility for all C++ targets
 add_project_arguments('-fvisibility=default', language: 'cpp')
diff --git a/src/config/public/config.h b/src/config/include/fourdst/config/config.h
similarity index 100%
rename from src/config/public/config.h
rename to src/config/include/fourdst/config/config.h
diff --git a/src/config/private/config.cpp b/src/config/lib/config.cpp
similarity index 98%
rename from src/config/private/config.cpp
rename to src/config/lib/config.cpp
index cbe02a5..d5c636f 100644
--- a/src/config/private/config.cpp
+++ b/src/config/lib/config.cpp
@@ -27,7 +27,7 @@
 
 #include "yaml-cpp/yaml.h"
 
-#include "config.h"
+#include "fourdst/config/config.h"
 
 namespace fourdst::config {
 
diff --git a/src/config/meson.build b/src/config/meson.build
index dbe6381..940210f 100644
--- a/src/config/meson.build
+++ b/src/config/meson.build
@@ -1,26 +1,26 @@
 # Define the library
 config_sources = files(
-  'private/config.cpp',
+  'lib/config.cpp',
 )
 
-config_headers = files(
-    'public/config.h'
-)
 
 # Define the libconfig library so it can be linked against by other parts of the build system
 libconfig = library('config',
     config_sources, 
-    include_directories: include_directories('public'),
+    include_directories: include_directories('include'),
     cpp_args: ['-fvisibility=default'],
     dependencies: [yaml_cpp_dep],
     install : true)
 
 config_dep = declare_dependency(
-    include_directories: include_directories('public'),
+    include_directories: include_directories('include'),
     link_with: libconfig,
     sources: config_sources,
     dependencies: [yaml_cpp_dep],
 )
 
 # Make headers accessible
+config_headers = files(
+  'include/fourdst/config/config.h'
+)
 install_headers(config_headers, subdir : 'fourdst/fourdst/config')
diff --git a/tests/config/configTest.cpp b/tests/config/configTest.cpp
index 6a30373..62add52 100644
--- a/tests/config/configTest.cpp
+++ b/tests/config/configTest.cpp
@@ -1,5 +1,4 @@
 #include <gtest/gtest.h>
-#include "config.h"
 #include <iostream>
 #include <string>
 #include <vector>
@@ -7,6 +6,8 @@
 #include <sstream>
 #include <algorithm>
 
+#include "fourdst/config/config.h"
+
 std::string EXAMPLE_FILENAME = std::string(getenv("MESON_SOURCE_ROOT")) + "/tests/config/example.yaml";
 /**
  * @file configTest.cpp
diff --git a/tests/config/meson.build b/tests/config/meson.build
index 8a5f3bb..af49da1 100644
--- a/tests/config/meson.build
+++ b/tests/config/meson.build
@@ -12,7 +12,6 @@ foreach test_file : test_sources
       exe_name,
       test_file,
       dependencies: [gtest_dep, config_dep, gtest_main],
-      include_directories: include_directories('../../src/config/public'),
       install_rpath: '@loader_path/../../src'  # Ensure runtime library path resolves correctly
   )