general/tomlplusplus
2
0
Fork 0
mirror of https://github.com/marzer/tomlplusplus.git synced 2026-02-03 09:42:30 +00:00
Code Issues Projects Releases Wiki Activity

Revert "build(meson): Update path for .pc and .cmake files (#165)" (#166)

Browse Source 
If you want to read the full story please see pull request [#165][], but
in short moving files from share/ to lib/ was needed because FreeBSD
didn't look for .pc files in share/pkgconfig/.

After a quick [discussion][] upstream, FreeBSD's [pkgconf was patched][]
to also honour .pc files in share/pkgconfig/.

Now that everybody looks for stuff in share/, the commit
b1ecdf0ed8 can be reverted, so that stuff
like cross-compilation can continue working fine.

[#165]: https://github.com/marzer/tomlplusplus/pull/165
[discussion]: https://lists.freebsd.org/archives/freebsd-hackers/2022-July/001355.html
[pkgconf was patched]: https://cgit.freebsd.org/ports/commit/?id=d48fab59daa56e0b3b6ffecef57a69c32ae9c0a7
This commit is contained in:
Andrea Pappacoda
2022-07-30 20:14:55 +02:00
committed by GitHub
parent b1ecdf0ed8
commit cda9ca6cfe
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/meson.build
View File

@@ -6,6 +6,7 @@ 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
@@ -18,7 +19,7 @@ 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('libdir')/'cmake'/meson.project_name(),
# install_dir: get_option('datadir')/'cmake'/meson.project_name(),
# arch_independent: true
#)
# In the meantime, install a pre-generated Package Version file
@@ -26,13 +27,13 @@ if get_option('generate_cmake_config') and not is_subproject
configuration: {'version': meson.project_version()},
input: '..'/'cmake'/'tomlplusplusConfigVersion.cmake.meson.in',
output: 'tomlplusplusConfigVersion.cmake',
install_dir: get_option('libdir')/'cmake'/meson.project_name()
install_dir: get_option('datadir')/'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('libdir')/'cmake'/meson.project_name(),
install_dir: get_option('datadir')/'cmake'/meson.project_name(),
)
endif