build(meson): more robust python build mode
This commit is contained in:
@@ -4,5 +4,5 @@ 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: config_header_root / 'fourdst' / 'vendor' / 'CLI')
|
||||
install_headers(cli11_impl_headers, install_dir: config_header_root / 'fourdst' / 'vendor' / 'CLI' / 'impl')
|
||||
install_headers(cli11_headers, install_dir: vendor_header_dir / 'CLI')
|
||||
install_headers(cli11_impl_headers, install_dir: vendor_header_dir / 'CLI' / 'impl')
|
||||
@@ -16,15 +16,11 @@ reflect_cpp_sources = files(
|
||||
|
||||
reflect_cpp_include_dirs = include_directories('include')
|
||||
|
||||
reflect_cpp_install_dir = get_option('lib_install_dir') != '' \
|
||||
? get_option('lib_install_dir') / 'vendor' \
|
||||
: get_option('libdir') / 'fourdst' / 'vendor'
|
||||
|
||||
reflect_cpp_library = static_library('reflect_cpp',
|
||||
reflect_cpp_sources,
|
||||
include_directories: [reflect_cpp_include_dirs, tomlpp_inc_dir],
|
||||
install: true,
|
||||
install_dir: reflect_cpp_install_dir)
|
||||
install_dir: vendor_lib_dir)
|
||||
|
||||
reflect_cpp_dep = declare_dependency(
|
||||
link_with: reflect_cpp_library,
|
||||
@@ -33,6 +29,6 @@ reflect_cpp_dep = declare_dependency(
|
||||
|
||||
install_subdir(
|
||||
'include',
|
||||
install_dir: config_header_root / 'fourdst' / 'vendor',
|
||||
install_dir: vendor_header_dir,
|
||||
strip_directory: true,
|
||||
)
|
||||
|
||||
@@ -2,7 +2,7 @@ tomlpp_inc_dir = include_directories('vendor/include')
|
||||
|
||||
install_subdir(
|
||||
'vendor/include',
|
||||
install_dir: config_header_root / 'fourdst' / 'vendor',
|
||||
install_dir: vendor_header_dir,
|
||||
strip_directory: true,
|
||||
exclude_files: ['meson.build'],
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user