From 11ed6d5a0f57b3516ee2cadf1bce20d380fa07ea Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Thu, 11 Jun 2026 12:21:32 -0400 Subject: [PATCH] fix(rpath): fixed macos RPATH bug --- Doxyfile | 2 +- build-config/CLI11/meson.build | 9 +++++++-- meson.build | 2 +- src/config/meson.build | 9 +++++++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Doxyfile b/Doxyfile index a32423d..e090c9d 100644 --- a/Doxyfile +++ b/Doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = libconfig # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v2.2.9 +PROJECT_NUMBER = v2.2.10 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewers a diff --git a/build-config/CLI11/meson.build b/build-config/CLI11/meson.build index a30049d..d76829c 100644 --- a/build-config/CLI11/meson.build +++ b/build-config/CLI11/meson.build @@ -4,5 +4,10 @@ cli11_dep = cli11_proj.get_variable('CLI11_dep') cli11_headers = cli11_proj.get_variable('cli11_headers') cli11_impl_headers = cli11_proj.get_variable('cli11_impl_headers') -install_headers(cli11_headers, install_dir: vendor_header_dir / 'CLI') -install_headers(cli11_impl_headers, install_dir: vendor_header_dir / 'CLI' / 'impl') \ No newline at end of file +if get_option('build_python') + install_data(cli11_headers, install_dir: vendor_header_dir / 'CLI') + install_data(cli11_impl_headers, install_dir: vendor_header_dir / 'CLI' / 'impl') +else + install_headers(cli11_headers, install_dir: vendor_header_dir / 'CLI') + install_headers(cli11_impl_headers, install_dir: vendor_header_dir / 'CLI' / 'impl') +endif \ No newline at end of file diff --git a/meson.build b/meson.build index e02d4c7..46fcda7 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', 'c'], version: 'v2.2.9', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') +project('libconfig', ['cpp', 'c'], version: 'v2.2.10', 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/meson.build b/src/config/meson.build index a6e2e2a..69edb8e 100644 --- a/src/config/meson.build +++ b/src/config/meson.build @@ -18,5 +18,10 @@ config_exception_headers = files( 'include/fourdst/config/exceptions/exceptions.h', ) -install_headers(config_headers, install_dir: config_header_install_dir) -install_headers(config_exception_headers, install_dir: config_header_install_dir / 'exceptions') \ No newline at end of file +if get_option('build_python') + install_data(config_headers, install_dir: config_header_install_dir) + install_data(config_exception_headers, install_dir: config_header_install_dir / 'exceptions') +else + install_headers(config_headers, install_dir: config_header_install_dir) + install_headers(config_exception_headers, install_dir: config_header_install_dir / 'exceptions') +endif \ No newline at end of file