fix(rpath): fixed macos RPATH bug

This commit is contained in:
2026-06-11 12:21:32 -04:00
parent e88d89e71e
commit 11ed6d5a0f
4 changed files with 16 additions and 6 deletions

View File

@@ -48,7 +48,7 @@ PROJECT_NAME = libconfig
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # 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 # 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 # for a project that appears at the top of each page and should give viewers a

View File

@@ -4,5 +4,10 @@ cli11_dep = cli11_proj.get_variable('CLI11_dep')
cli11_headers = cli11_proj.get_variable('cli11_headers') cli11_headers = cli11_proj.get_variable('cli11_headers')
cli11_impl_headers = cli11_proj.get_variable('cli11_impl_headers') cli11_impl_headers = cli11_proj.get_variable('cli11_impl_headers')
install_headers(cli11_headers, install_dir: vendor_header_dir / 'CLI') if get_option('build_python')
install_headers(cli11_impl_headers, install_dir: vendor_header_dir / 'CLI' / 'impl') 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

View File

@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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 default visibility for all C++ targets
add_project_arguments('-fvisibility=default', language: 'cpp') add_project_arguments('-fvisibility=default', language: 'cpp')

View File

@@ -18,5 +18,10 @@ config_exception_headers = files(
'include/fourdst/config/exceptions/exceptions.h', 'include/fourdst/config/exceptions/exceptions.h',
) )
install_headers(config_headers, install_dir: config_header_install_dir) if get_option('build_python')
install_headers(config_exception_headers, install_dir: config_header_install_dir / 'exceptions') 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