build(vendor-libraries): update install to be more reliable
vendor libaries for libconfig are now properly installed so linking can be done reliably
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
cmake = import('cmake')
|
||||
subdir('tomlpp')
|
||||
subdir('reflect-cpp')
|
||||
subdir('CLI11')
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
tomlpp_dep = dependency('tomlplusplus', required: true, static: true).as_system()
|
||||
|
||||
reflect_cpp_sources = files(
|
||||
'src/yyjson.c',
|
||||
@@ -21,7 +20,7 @@ reflect_cpp_library = static_library(
|
||||
'reflect_cpp',
|
||||
reflect_cpp_sources,
|
||||
include_directories: reflect_cpp_include_dirs,
|
||||
install: false,
|
||||
install: true,
|
||||
dependencies: [tomlpp_dep],
|
||||
)
|
||||
|
||||
@@ -29,4 +28,10 @@ reflect_cpp_dep = declare_dependency(
|
||||
link_with: reflect_cpp_library,
|
||||
include_directories: reflect_cpp_include_dirs,
|
||||
dependencies: [tomlpp_dep],
|
||||
)
|
||||
)
|
||||
|
||||
install_subdir(
|
||||
'include',
|
||||
install_dir: get_option('includedir'),
|
||||
strip_directory: true
|
||||
)
|
||||
|
||||
7
build-config/tomlpp/meson.build
Normal file
7
build-config/tomlpp/meson.build
Normal file
@@ -0,0 +1,7 @@
|
||||
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'),
|
||||
strip_directory: true
|
||||
)
|
||||
Reference in New Issue
Block a user