blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change meson to be more configurable 

We move the warning options into the project's default_options, meaning
a user can configure them with `meson configure` and not need to edit
the file.

We also make it possible to disable logind/libcap even if they're
present.
This commit is contained in:
Scott Anderson 2017-08-20 22:19:47 +12:00
parent a1c3636d69
commit 75978636d9
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meson.build
View File

@ -1,16 +1,17 @@
project('wlroots', 'c', project('wlroots', 'c',
license: 'MIT', license: 'MIT',
default_options: 'c_std=c11') default_options: [
'c_std=c11',
'warning_level=2',
'werror=true',
])
add_project_arguments('-Wall', '-Wextra', '-Wno-unused-parameter', '-Werror', language: 'c') add_project_arguments('-Wno-unused-parameter', language: 'c')
add_project_arguments('-DWLR_SRC_DIR="@0@"'.format(meson.source_root()), language: 'c') add_project_arguments('-DWLR_SRC_DIR="@0@"'.format(meson.source_root()), language: 'c')
add_project_link_arguments('-Wl,-rpath,@0@'.format(meson.build_root()), language: 'c') add_project_link_arguments('-Wl,-rpath,@0@'.format(meson.build_root()), language: 'c')
wlr_inc = include_directories('include') wlr_inc = include_directories('include')
#add_project_arguments('-flto', language: 'c')
#add_project_link_arguments('-flto', language: 'c')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
# Clang complains about some zeroed initialiser lists (= {0}), even though they are valid # Clang complains about some zeroed initialiser lists (= {0}), even though they are valid
@ -35,11 +36,11 @@ libcap = dependency('libcap', required: false)
systemd = dependency('libsystemd', required: false) systemd = dependency('libsystemd', required: false)
math = cc.find_library('m', required: false) math = cc.find_library('m', required: false)
if libcap.found() if libcap.found() and get_option('enable_libcap')
add_project_arguments('-DHAS_LIBCAP', language: 'c') add_project_arguments('-DHAS_LIBCAP', language: 'c')
endif endif
if systemd.found() if systemd.found() and get_option('enable_systemd')
add_project_arguments('-DHAS_SYSTEMD', language: 'c') add_project_arguments('-DHAS_SYSTEMD', language: 'c')
endif endif
@ -50,7 +51,7 @@ subdir('types')
subdir('util') subdir('util')
subdir('xcursor') subdir('xcursor')
_wlr_deps = [ wlr_deps = [
wayland_server, wayland_server,
wayland_client, wayland_client,
wayland_egl, wayland_egl,
@ -77,11 +78,11 @@ lib_wlr = library('wlroots', files('dummy.c'),
lib_wlr_util, lib_wlr_util,
lib_wlr_xcursor, lib_wlr_xcursor,
], ],
dependencies: _wlr_deps, dependencies: wlr_deps,
include_directories: wlr_inc) include_directories: wlr_inc)
wlroots = declare_dependency(link_with: lib_wlr, wlroots = declare_dependency(link_with: lib_wlr,
dependencies: _wlr_deps, dependencies: wlr_deps,
include_directories: wlr_inc) include_directories: wlr_inc)
subdir('examples') subdir('examples')

2
meson_options.txt Normal file
View File

@ -0,0 +1,2 @@
option('enable_libcap', type: 'boolean', value: true, description: 'Enable support for capabilities')
option('enable_systemd', type: 'boolean', value: true, description: 'Enable support for logind')