1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00

Merge pull request #12773 from roberth/config-h-low-hanging-fruit

Unexpose config headers (low hanging fruit only)
This commit is contained in:
John Ericson 2025-03-28 12:43:28 -04:00 committed by GitHub
commit c36a9b8e1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 25 additions and 82 deletions

View file

@ -32,11 +32,16 @@ deps_private += rapidcheck
gtest = dependency('gtest', main : true)
deps_private += gtest
configdata = configuration_data()
configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
config_h = configure_file(
configuration : configdata,
output : 'config-util-tests.hh',
)
add_project_arguments(
# TODO(Qyriad): Yes this is how the autoconf+Make system did it.
# It would be nice for our headers to be idempotent instead.
'-include', 'config-util.hh',
'-include', 'config-util.h',
'-include', 'config-util-tests.hh',
language : 'cpp',
)
@ -79,6 +84,7 @@ include_dirs = [include_directories('.')]
this_exe = executable(
meson.project_name(),
sources,
config_h,
dependencies : deps_private_subproject + deps_private + deps_other,
include_directories : include_dirs,
# TODO: -lrapidcheck, see ../libutil-support/build.meson