mirror/tomlplusplus
1
0
Fork 0
mirror of https://github.com/marzer/tomlplusplus.git synced 2024-09-15 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: Install CMake and pkg-config files into architecture-independe… (#60)

Browse Source 
toml++ is header-only so these should be installed into architecture-independent directories to allow them to be found for crosscompiling regardless of the architecture they were installed on.

Fixes #59.
This commit is contained in:
Raul Tambre 2020-09-17 15:16:36 +03:00 committed by GitHub
parent bf26a88412
commit 248e6031cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meson.build
View File

@ -164,7 +164,7 @@ if is_msvc or is_icc_cl
'/GF', # string pooling '/GF', # string pooling
'/openmp-', '/openmp-',
'/permissive-', '/permissive-',
'/sdl-', '/sdl-',
'/utf-8', '/utf-8',
'/volatile:iso', '/volatile:iso',
'/Zc:__cplusplus', '/Zc:__cplusplus',
@ -182,7 +182,7 @@ if is_msvc or is_icc_cl
'/Oy', # omit frame pointers '/Oy', # omit frame pointers
'/Oi', # generate intrinsics '/Oi', # generate intrinsics
language : 'cpp' language : 'cpp'
) )
add_project_link_arguments('/ltcg', language : 'cpp') add_project_link_arguments('/ltcg', language : 'cpp')
endif endif
if is_pedantic if is_pedantic
@ -479,10 +479,11 @@ tomlplusplus_dep = declare_dependency(
) )
pkgc = import('pkgconfig') pkgc = import('pkgconfig')
pkgc.generate ( pkgc.generate(
name: meson.project_name(), name: meson.project_name(),
version: meson.project_version(), version: meson.project_version(),
description: 'Header-only TOML config file parser and serializer for modern C++' description: 'Header-only TOML config file parser and serializer for modern C++',
install_dir: join_paths(get_option('datadir'), 'pkgconfig'),
) )
# cmake # cmake
@ -490,13 +491,15 @@ if get_option('generate_cmake_config') and not is_subproject
cmake = import('cmake') cmake = import('cmake')
cmake.write_basic_package_version_file( cmake.write_basic_package_version_file(
name: meson.project_name(), name: meson.project_name(),
version: meson.project_version() version: meson.project_version(),
install_dir: join_paths('lib', 'cmake', meson.project_name()),
) )
cmake_conf = configuration_data() cmake_conf = configuration_data()
cmake.configure_package_config_file( cmake.configure_package_config_file(
name: meson.project_name(), name: meson.project_name(),
input: 'cmake/tomlplusplus.cmake.in', input: 'cmake/tomlplusplus.cmake.in',
configuration: cmake_conf, configuration: cmake_conf,
install_dir: join_paths('lib', 'cmake', meson.project_name()),
) )
endif endif