mirror of
https://github.com/NixOS/nix.git
synced 2025-11-20 17:29:36 +01:00
Get rid of raw -D defines, always use private config files
Now that we have the private vs public distinction, we can do this
without leaking information downstream.
(cherry picked from commit 7a7fe350d5)
This commit is contained in:
parent
7e96f31753
commit
efb0feb22b
4 changed files with 75 additions and 103 deletions
|
|
@ -40,6 +40,8 @@ deps_private += gtest
|
|||
configdata = configuration_data()
|
||||
configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
|
||||
|
||||
configdata.set_quoted('NIX_STORE_DIR', nix_store.get_variable('storedir'))
|
||||
|
||||
config_priv_h = configure_file(
|
||||
configuration : configdata,
|
||||
output : 'store-tests-config.hh',
|
||||
|
|
@ -89,7 +91,6 @@ this_exe = executable(
|
|||
include_directories : include_dirs,
|
||||
# TODO: -lrapidcheck, see ../libutil-support/build.meson
|
||||
link_args: linker_export_flags + ['-lrapidcheck'],
|
||||
cpp_args : [ '-DNIX_STORE_DIR="' + nix_store.get_variable('storedir') + '"' ],
|
||||
# get main from gtest
|
||||
install : true,
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue