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_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(
|
||||
'include',
|
||||
install_dir: get_option('includedir'),
|
||||
install_dir: get_option('includedir') / 'fourdst' / 'vendor',
|
||||
strip_directory: true
|
||||
)
|
||||
|
||||
@@ -2,6 +2,6 @@ tomlpp_dep = dependency('tomlplusplus', required: true, static: true).as_system(
|
||||
|
||||
install_subdir(
|
||||
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
|
||||
)
|
||||
Reference in New Issue
Block a user