build(vendor): vendor libraries now install in a dedicated directory
We now install vendor libraries into includedir/fourdst/vendor to avoid conflicts with user installed libraries. Note that currently this only applies to headers and not compiled shared libraries BREAKING CHANGE:
This commit is contained in:
@@ -1,2 +1,8 @@
|
|||||||
cli11_proj = subproject('cli11')
|
cli11_proj = subproject('cli11')
|
||||||
cli11_dep = cli11_proj.get_variable('CLI11_dep')
|
cli11_dep = cli11_proj.get_variable('CLI11_dep')
|
||||||
|
|
||||||
|
install_subdir(
|
||||||
|
meson.project_source_root() / 'subprojects' / 'CLI11-2.6.1' / 'include',
|
||||||
|
install_dir: get_option('includedir') / 'fourdst' / 'vendor',
|
||||||
|
strip_directory: true
|
||||||
|
)
|
||||||
@@ -32,6 +32,6 @@ reflect_cpp_dep = declare_dependency(
|
|||||||
|
|
||||||
install_subdir(
|
install_subdir(
|
||||||
'include',
|
'include',
|
||||||
install_dir: get_option('includedir'),
|
install_dir: get_option('includedir') / 'fourdst' / 'vendor',
|
||||||
strip_directory: true
|
strip_directory: true
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -2,6 +2,6 @@ tomlpp_dep = dependency('tomlplusplus', required: true, static: true).as_system(
|
|||||||
|
|
||||||
install_subdir(
|
install_subdir(
|
||||||
meson.project_source_root() / 'subprojects' / 'tomlplusplus-3.4.0' / 'include',
|
meson.project_source_root() / 'subprojects' / 'tomlplusplus-3.4.0' / 'include',
|
||||||
install_dir: get_option('includedir'),
|
install_dir: get_option('includedir') / 'fourdst' / 'vendor',
|
||||||
strip_directory: true
|
strip_directory: true
|
||||||
)
|
)
|
||||||
@@ -37,6 +37,9 @@ endif
|
|||||||
|
|
||||||
if get_option('pkg_config')
|
if get_option('pkg_config')
|
||||||
message('Generating pkg-config file for libconfig...')
|
message('Generating pkg-config file for libconfig...')
|
||||||
|
|
||||||
|
vendor_inc_flags = '-I${includedir}' / 'fourdst' / 'vendor'
|
||||||
|
|
||||||
pkg = import('pkgconfig')
|
pkg = import('pkgconfig')
|
||||||
pkg.generate(
|
pkg.generate(
|
||||||
name: 'libconfig',
|
name: 'libconfig',
|
||||||
@@ -44,6 +47,7 @@ if get_option('pkg_config')
|
|||||||
version: meson.project_version(),
|
version: meson.project_version(),
|
||||||
libraries: [reflect_cpp_library],
|
libraries: [reflect_cpp_library],
|
||||||
filebase: 'fourdst_config',
|
filebase: 'fourdst_config',
|
||||||
install_dir: join_paths(get_option('libdir'), 'pkgconfig')
|
install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
|
||||||
|
extra_cflags: vendor_inc_flags
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
config_dep = declare_dependency(
|
config_dep = declare_dependency(
|
||||||
include_directories: include_directories('include'),
|
include_directories: [
|
||||||
|
include_directories('include'),
|
||||||
|
include_directories('include/fourdst/config'),
|
||||||
|
],
|
||||||
dependencies: [reflect_cpp_dep],
|
dependencies: [reflect_cpp_dep],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user