tboudreaux/liblogging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(rpath): fixed macos RPATH bug

Browse Source
This commit is contained in:
Emily Boudreaux
2026-06-11 12:23:27 -04:00
parent 10d93fe4e7
commit 90ac4840ee
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
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('liblogging', 'cpp', version: 'v1.1.6', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') project('liblogging', 'cpp', version: 'v1.1.7', 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')

12
src/logging/meson.build
View File

@@ -26,15 +26,20 @@ dependencies = [
quill_dep, quill_dep,
] ]
samedir_rpath = host_machine.system() == 'darwin' ? '@loader_path' : '$ORIGIN'
liblogging = library('logging', liblogging = library('logging',
logging_sources, logging_sources,
include_directories: include_directories('include'), include_directories: include_directories('include'),
cpp_args: ['-fvisibility=default'], cpp_args: ['-fvisibility=default'],
install : true, install : true,
install_dir: logging_libdir, install_dir: logging_libdir,
install_rpath: samedir_rpath,
build_rpath: samedir_rpath,
dependencies: dependencies dependencies: dependencies
) )
logging_dep = declare_dependency( logging_dep = declare_dependency(
include_directories: include_directories('include'), include_directories: include_directories('include'),
link_with: liblogging, link_with: liblogging,
@@ -44,4 +49,9 @@ logging_dep = declare_dependency(
logging_headers = files( logging_headers = files(
'include/fourdst/logging/logging.h' 'include/fourdst/logging/logging.h'
) )
install_headers(logging_headers, install_dir: logging_header_install_dir)
if get_option('build_python')
install_data(logging_headers, install_dir: logging_header_install_dir)
else
install_headers(logging_headers, install_dir: logging_header_install_dir)
endif