diff --git a/Doxyfile b/Doxyfile index de77416..e98e20b 100644 --- a/Doxyfile +++ b/Doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = libconfig # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v2.2.4 +PROJECT_NUMBER = v2.2.5 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewers a diff --git a/build-config/meson.build b/build-config/meson.build index de03170..7c8fe64 100644 --- a/build-config/meson.build +++ b/build-config/meson.build @@ -1,3 +1,4 @@ cmake = import('cmake') +subdir('tomlpp') subdir('reflect-cpp') subdir('CLI11') diff --git a/build-config/reflect-cpp/meson.build b/build-config/reflect-cpp/meson.build index f492b42..dc5cf18 100644 --- a/build-config/reflect-cpp/meson.build +++ b/build-config/reflect-cpp/meson.build @@ -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], -) \ No newline at end of file +) + +install_subdir( + 'include', + install_dir: get_option('includedir'), + strip_directory: true +) diff --git a/build-config/tomlpp/meson.build b/build-config/tomlpp/meson.build new file mode 100644 index 0000000..a99770b --- /dev/null +++ b/build-config/tomlpp/meson.build @@ -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 +) \ No newline at end of file diff --git a/meson.build b/meson.build index 539d599..ce6634e 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # *********************************************************************** # -project('libconfig', ['cpp', 'c'], version: 'v2.2.4', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') +project('libconfig', ['cpp', 'c'], version: 'v2.2.5', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') # Add default visibility for all C++ targets add_project_arguments('-fvisibility=default', language: 'cpp') @@ -42,7 +42,7 @@ if get_option('pkg_config') name: 'libconfig', description: 'Configuration module for SERiF and related projects', version: meson.project_version(), - subdirs: ['fourdst'], + libraries: [reflect_cpp_library], filebase: 'fourdst_config', install_dir: join_paths(get_option('libdir'), 'pkgconfig') ) diff --git a/src/config/include/fourdst/config/validate.h b/src/config/include/fourdst/config/validate.h index 49b6735..a4b1fe3 100644 --- a/src/config/include/fourdst/config/validate.h +++ b/src/config/include/fourdst/config/validate.h @@ -2,8 +2,8 @@ #include "fourdst/config/ansi.h" -#include -#include +#include "rfl.hpp" +#include "toml++/toml.hpp" #include #include #include diff --git a/src/config/meson.build b/src/config/meson.build index 8ee000a..2c71dfe 100644 --- a/src/config/meson.build +++ b/src/config/meson.build @@ -12,8 +12,8 @@ config_headers = files( ) install_headers(config_headers, subdir : 'fourdst/config') -condig_exception_headers = files( +config_exception_headers = files( 'include/fourdst/config/exceptions/exceptions.h', ) -install_headers(config_headers, subdir : 'fourdst/config/exceptions') +install_headers(config_exception_headers, subdir : 'fourdst/config/exceptions')