diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-08-20 09:30:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-20 09:30:29 -0400 |
| commit | b56f15bca7e4671e064c41b6f1323247ea8fc6cf (patch) | |
| tree | c7b90ac31d782742c628ffa2803b9243cc2e2de4 | |
| parent | a1c3636d69fa6fa83d34f38bffc1640b17fed101 (diff) | |
| parent | 75978636d9eddcbaf1ebea4091af2b18da71a7f4 (diff) | |
Merge pull request #117 from ascent12/meson-options
Change meson to be more configurable
| -rw-r--r-- | meson.build | 45 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 25 insertions, 22 deletions
diff --git a/meson.build b/meson.build index d0bcce27..4c449f53 100644 --- a/meson.build +++ b/meson.build @@ -1,16 +1,17 @@ project('wlroots', 'c', 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_link_arguments('-Wl,-rpath,@0@'.format(meson.build_root()), language: 'c') wlr_inc = include_directories('include') -#add_project_arguments('-flto', language: 'c') -#add_project_link_arguments('-flto', language: 'c') - cc = meson.get_compiler('c') # Clang complains about some zeroed initialiser lists (= {0}), even though they are valid @@ -21,25 +22,25 @@ endif wayland_server = dependency('wayland-server') wayland_client = dependency('wayland-client') -wayland_egl = dependency('wayland-egl') +wayland_egl = dependency('wayland-egl') wayland_protos = dependency('wayland-protocols') -egl = dependency('egl') -glesv2 = dependency('glesv2') -drm = dependency('libdrm') -gbm = dependency('gbm') -libinput = dependency('libinput') -xkbcommon = dependency('xkbcommon') -udev = dependency('libudev') -pixman = dependency('pixman-1') -libcap = dependency('libcap', required: false) -systemd = dependency('libsystemd', required: false) -math = cc.find_library('m', required: false) +egl = dependency('egl') +glesv2 = dependency('glesv2') +drm = dependency('libdrm') +gbm = dependency('gbm') +libinput = dependency('libinput') +xkbcommon = dependency('xkbcommon') +udev = dependency('libudev') +pixman = dependency('pixman-1') +libcap = dependency('libcap', required: false) +systemd = dependency('libsystemd', 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') endif -if systemd.found() +if systemd.found() and get_option('enable_systemd') add_project_arguments('-DHAS_SYSTEMD', language: 'c') endif @@ -50,7 +51,7 @@ subdir('types') subdir('util') subdir('xcursor') -_wlr_deps = [ +wlr_deps = [ wayland_server, wayland_client, wayland_egl, @@ -77,11 +78,11 @@ lib_wlr = library('wlroots', files('dummy.c'), lib_wlr_util, lib_wlr_xcursor, ], - dependencies: _wlr_deps, + dependencies: wlr_deps, include_directories: wlr_inc) wlroots = declare_dependency(link_with: lib_wlr, - dependencies: _wlr_deps, + dependencies: wlr_deps, include_directories: wlr_inc) subdir('examples') diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 00000000..ab74eec1 --- /dev/null +++ b/meson_options.txt @@ -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') |