chore(3p/nix): more improvements
(cherry picked from commit 507d28fd226e018d5927b49b1bd07833cbd49d25)
This commit is contained in:
parent
9974eca8a0
commit
e52ce543a4
2 changed files with 9 additions and 10 deletions
7
third_party/nix/meson.build
vendored
7
third_party/nix/meson.build
vendored
|
@ -16,7 +16,9 @@ project(
|
|||
|
||||
default_options : [
|
||||
'cpp_std=c++17',
|
||||
'warning_level=3'
|
||||
'warning_level=3',
|
||||
'optimization=3',
|
||||
'debug=true'
|
||||
],
|
||||
version : run_command('cat', './.version').stdout().strip(),
|
||||
license : 'MIT'
|
||||
|
@ -26,7 +28,7 @@ project(
|
|||
#-------------------------------------------------
|
||||
cpp = meson.get_compiler('cpp')
|
||||
|
||||
add_project_arguments('-g', '-Wdeprecated', '-Wno-non-virtual-dtor', '-include', 'config.h', language : 'cpp')
|
||||
add_project_arguments(get_option('cxxflags'), language : 'cpp')
|
||||
add_project_link_arguments(get_option('ldflags'), language: 'cpp')
|
||||
|
||||
|
||||
|
@ -535,6 +537,7 @@ install_headers(
|
|||
conf,
|
||||
install_dir : join_paths(includedir, 'nix'))
|
||||
|
||||
add_project_arguments('-include', 'config.h', language : 'cpp')
|
||||
src_inc = [include_directories('.', 'src')]
|
||||
|
||||
project_dirs = [
|
||||
|
|
12
third_party/nix/meson_options.txt
vendored
12
third_party/nix/meson_options.txt
vendored
|
@ -25,19 +25,15 @@ option(
|
|||
'-L/lib'],
|
||||
description : 'Link flags')
|
||||
|
||||
option(
|
||||
'cflags',
|
||||
type : 'array',
|
||||
value : [
|
||||
'-O3'],
|
||||
description : 'C build flags')
|
||||
|
||||
option(
|
||||
'cxxflags',
|
||||
type : 'array',
|
||||
value : [
|
||||
'-O3'],
|
||||
description : 'CXX build flags')
|
||||
'-Wdeprecated',
|
||||
'-Wno-non-virtual-dtor',
|
||||
'-Wno-unused-parameter'],
|
||||
description : 'C build flags')
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue