Code Review
/
src
/
agl-compositor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
compositor: Fix memleak when disabling the output
[src/agl-compositor.git]
/
meson.build
diff --git
a/meson.build
b/meson.build
index
17913d0
..
bdec8fd
100644
(file)
--- a/
meson.build
+++ b/
meson.build
@@
-1,16
+1,17
@@
project('agl-compositor',
'c','cpp',
project('agl-compositor',
'c','cpp',
- version: '0.0.2
0
',
+ version: '0.0.2
1
',
default_options: [
'warning_level=3',
'c_std=gnu99',
default_options: [
'warning_level=3',
'c_std=gnu99',
+ 'werror=true',
],
],
- meson_version: '>= 0.
47
',
+ meson_version: '>= 0.
53
',
license: 'MIT/Expat',
)
config_h = configuration_data()
license: 'MIT/Expat',
)
config_h = configuration_data()
-libweston_version = 'libweston-
9
'
+libweston_version = 'libweston-
10
'
pkgconfig = import('pkgconfig')
fs = import('fs')
pkgconfig = import('pkgconfig')
fs = import('fs')
@@
-21,8
+22,6
@@
add_project_arguments(
cc.get_supported_arguments([
'-Wno-unused-parameter',
'-Wno-pedantic',
cc.get_supported_arguments([
'-Wno-unused-parameter',
'-Wno-pedantic',
- '-Wextra',
- '-Werror'
]),
language: 'c'
)
]),
language: 'c'
)
@@
-157,7
+156,7
@@
libweston_dep = dependency(libweston_version)
deps_libweston = [
dependency('wayland-server'),
libweston_dep,
deps_libweston = [
dependency('wayland-server'),
libweston_dep,
- dependency('libweston-desktop-
9
'),
+ dependency('libweston-desktop-
10
'),
local_dep,
]
local_dep,
]
@@
-172,6
+171,7
@@
srcs_agl_compositor = [
'src/input.c',
'shared/option-parser.c',
'shared/os-compatibility.c',
'src/input.c',
'shared/option-parser.c',
'shared/os-compatibility.c',
+ 'shared/process-util.c',
agl_shell_server_protocol_h,
agl_shell_desktop_server_protocol_h,
agl_screenshooter_server_protocol_h,
agl_shell_server_protocol_h,
agl_shell_desktop_server_protocol_h,
agl_screenshooter_server_protocol_h,
@@
-239,7
+239,9
@@
if deps_remoting.length() == depnames.length()
message('Found remoting depends, enabling remoting')
endif
message('Found remoting depends, enabling remoting')
endif
-if deps_waltham.length() == depnames_waltham.length() + depnames.length()
+if deps_waltham.length() == depnames_waltham.length() + depnames.length() and not get_option('waltham')
+ message('Found waltham depends, but waltham is deprecated')
+elif deps_waltham.length() == depnames_waltham.length() + depnames.length() and get_option('waltham')
config_h.set('HAVE_WALTHAM', 1)
message('Found waltham depends, enabling waltham')
endif
config_h.set('HAVE_WALTHAM', 1)
message('Found waltham depends, enabling waltham')
endif
@@
-257,7
+259,7
@@
libexec_compositor = shared_library(
dependencies: deps_libweston,
install_dir: dir_module_agl_compositor,
install: true,
dependencies: deps_libweston,
install_dir: dir_module_agl_compositor,
install: true,
- version:
'0.0.0'
,
+ version:
meson.project_version()
,
soversion: 0
)
soversion: 0
)
@@
-296,3
+298,7
@@
install_data(
common_inc = [ include_directories('src'), include_directories('.') ]
subdir('clients')
common_inc = [ include_directories('src'), include_directories('.') ]
subdir('clients')
+
+if get_option('grpc-proxy')
+ subdir('grpc-proxy')
+endif