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
clients/grpc: Initial start for gRPC proxy
[src/agl-compositor.git]
/
meson.build
diff --git
a/meson.build
b/meson.build
index
4f0e763
..
2ed517b
100644
(file)
--- a/
meson.build
+++ b/
meson.build
@@
-1,17
+1,17
@@
project('agl-compositor',
'c','cpp',
project('agl-compositor',
'c','cpp',
- version: '0.0.
19
',
+ version: '0.0.
20
',
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.
60
',
license: 'MIT/Expat',
)
config_h = configuration_data()
license: 'MIT/Expat',
)
config_h = configuration_data()
-agl_compositor_version = '0.0.19'
-libweston_version = 'libweston-8'
+libweston_version = 'libweston-10'
pkgconfig = import('pkgconfig')
fs = import('fs')
pkgconfig = import('pkgconfig')
fs = import('fs')
@@
-22,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'
)
@@
-45,7
+43,7
@@
endforeach
dep_libsystemd = dependency('libsystemd', required: false)
dep_libsmack = dependency('libsmack', required: false)
dep_libsystemd = dependency('libsystemd', required: false)
dep_libsmack = dependency('libsmack', required: false)
-dep_scanner = dependency('wayland-scanner'
, native: true
)
+dep_scanner = dependency('wayland-scanner')
prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
dep_wp = dependency('wayland-protocols', version: '>= 1.18')
dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir')
prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
dep_wp = dependency('wayland-protocols', version: '>= 1.18')
dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir')
@@
-158,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-
8
'),
+ dependency('libweston-desktop-
10
'),
local_dep,
]
local_dep,
]
@@
-173,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,
@@
-279,9
+278,9
@@
exe_agl_compositor = executable(
)
pkgconfig.generate(
)
pkgconfig.generate(
- filebase: 'agl-compositor-@0@-protocols'.format(
agl_compositor_version
),
+ filebase: 'agl-compositor-@0@-protocols'.format(
meson.project_version()
),
name: 'agl-compositor private protocols',
name: 'agl-compositor private protocols',
- version:
agl_compositor_version
,
+ version:
meson.project_version()
,
description: 'agl-compositor protocol files',
variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
description: 'agl-compositor protocol files',
variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),