Skip to content

Commit

Permalink
build(meson): Update path for .pc and .cmake files (#165)
Browse files Browse the repository at this point in the history
Thanks for your contribution @diizzyy!
  • Loading branch information
diizzyy authored Jul 21, 2022
1 parent 6a47ce7 commit b1ecdf0
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions include/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ if not is_subproject
import('pkgconfig').generate(
name: meson.project_name(),
description: 'Header-only TOML config file parser and serializer for C++',
install_dir: get_option('datadir')/'pkgconfig',
url: 'https://marzer.github.io/tomlplusplus'
)
endif
Expand All @@ -19,21 +18,21 @@ if get_option('generate_cmake_config') and not is_subproject
#cmake.write_basic_package_version_file(
# name: meson.project_name(),
# version: meson.project_version(),
# install_dir: get_option('datadir')/'cmake'/meson.project_name(),
# install_dir: get_option('libdir')/'cmake'/meson.project_name(),
# arch_independent: true
#)
# In the meantime, install a pre-generated Package Version file
configure_file(
configuration: {'version': meson.project_version()},
input: '..'/'cmake'/'tomlplusplusConfigVersion.cmake.meson.in',
output: 'tomlplusplusConfigVersion.cmake',
install_dir: get_option('datadir')/'cmake'/meson.project_name()
install_dir: get_option('libdir')/'cmake'/meson.project_name()
)

cmake.configure_package_config_file(
name: meson.project_name(),
input: '..'/'cmake'/'tomlplusplusConfig.cmake.meson.in',
configuration: configuration_data({'includedir': get_option('includedir')}),
install_dir: get_option('datadir')/'cmake'/meson.project_name(),
install_dir: get_option('libdir')/'cmake'/meson.project_name(),
)
endif

0 comments on commit b1ecdf0

Please # to comment.