mirror of
https://github.com/NixOS/nix.git
synced 2025-11-13 05:56:03 +01:00
meson: Apply formatting universally
Now that we have applied the [1] patch, the diff is much nicer and less noisy. [1]: https://www.github.com/mesonbuild/meson/pull/14861
This commit is contained in:
parent
bf80696ed9
commit
385e2c3542
62 changed files with 444 additions and 454 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# Public headers directory
|
||||
|
||||
include_dirs = [include_directories('../..')]
|
||||
include_dirs = [ include_directories('../..') ]
|
||||
|
||||
headers = files(
|
||||
'flake.hh',
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
project('nix-flake', 'cpp',
|
||||
project(
|
||||
'nix-flake',
|
||||
'cpp',
|
||||
version : files('.version'),
|
||||
default_options : [
|
||||
'cpp_std=c++2a',
|
||||
|
|
@ -14,8 +16,7 @@ cxx = meson.get_compiler('cpp')
|
|||
|
||||
subdir('nix-meson-build-support/deps-lists')
|
||||
|
||||
deps_private_maybe_subproject = [
|
||||
]
|
||||
deps_private_maybe_subproject = []
|
||||
deps_public_maybe_subproject = [
|
||||
dependency('nix-util'),
|
||||
dependency('nix-store'),
|
||||
|
|
@ -40,10 +41,10 @@ endforeach
|
|||
|
||||
sources = files(
|
||||
'config.cc',
|
||||
'flake-primops.cc',
|
||||
'flake.cc',
|
||||
'flakeref.cc',
|
||||
'lockfile.cc',
|
||||
'flake-primops.cc',
|
||||
'settings.cc',
|
||||
'url-name.cc',
|
||||
)
|
||||
|
|
@ -59,7 +60,7 @@ this_library = library(
|
|||
generated_headers,
|
||||
dependencies : deps_public + deps_private + deps_other,
|
||||
include_directories : include_dirs,
|
||||
link_args: linker_export_flags,
|
||||
link_args : linker_export_flags,
|
||||
prelink : true, # For C++ static initializers
|
||||
install : true,
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue