From 067a3a0d51569428b137339a2a21ed8f83bbdfca Mon Sep 17 00:00:00 2001
From: Emily Boudreaux <thomas@boudreauxmail.com>
Date: Mon, 11 Aug 2025 12:32:04 -0400
Subject: [PATCH] fix(yaml-cpp): added proper meson install dir handling

---
 build-config/yaml-cpp/meson.build | 23 +++++++++++------------
 meson.build                       |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/build-config/yaml-cpp/meson.build b/build-config/yaml-cpp/meson.build
index 6b3ba27..3009725 100644
--- a/build-config/yaml-cpp/meson.build
+++ b/build-config/yaml-cpp/meson.build
@@ -1,19 +1,18 @@
+cmake = import('cmake')
 yaml_cpp_cmake_options = cmake.subproject_options()
+
 yaml_cpp_cmake_options.add_cmake_defines({
- 'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
- 'BUILD_SHARED_LIBS': 'ON',
- 'CMAKE_SKIP_INSTALL_RULES': 'ON',
- 'YAML_CPP_BUILD_TESTS': 'OFF',
- 'CMAKE_CXX_FLAGS': '-Wno-shadow',
- 'CMAKE_C_FLAGS':   '-Wno-shadow',
-})
+        'BUILD_SHARED_LIBS': 'ON',
+        'YAML_CPP_BUILD_TESTS': 'OFF',
+        'CMAKE_CXX_FLAGS': '-Wno-shadow',
+        'CMAKE_C_FLAGS': '-Wno-shadow',
+        'CMAKE_INSTALL_LIBDIR': get_option('libdir'),
+        'CMAKE_INSTALL_INCLUDEDIR': get_option('includedir'),
+        'CMAKE_POLICY_VERSION_MINIMUM': '3.5'
+    })
+
 yaml_cpp_sp = cmake.subproject(
     'yaml-cpp',
     options: yaml_cpp_cmake_options,
 )
 yaml_cpp_dep = yaml_cpp_sp.dependency('yaml-cpp')
-
-message('Registering yaml-cpp headers (' + meson.global_source_root() + '/subprojects/yaml-cpp/include/yaml-cpp) for installation...')
-yaml_cpp_headers = meson.global_source_root() + '/subprojects/yaml-cpp/include/yaml-cpp'
-install_subdir(yaml_cpp_headers, install_dir: get_option('includedir'))
-message('Done registering yaml-cpp headers for installation!')
diff --git a/meson.build b/meson.build
index f551926..3816640 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.1.2', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
+project('libconfig', 'cpp', version: 'v1.1.3', 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')