project('agl-compositor',
'c','cpp',
- version: '0.0.20',
+ version: '0.0.21',
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()
-libweston_version = 'libweston-8'
+libweston_version = 'libweston-10'
pkgconfig = import('pkgconfig')
fs = import('fs')
cc.get_supported_arguments([
'-Wno-unused-parameter',
'-Wno-pedantic',
- '-Wextra',
- '-Werror'
]),
language: 'c'
)
endforeach
endforeach
-# libweston pkg-config file already has 'libweston' as prefix but
-# agl-compositor uses 'libweston' also. This makes use of the prefix path as to
-# allow building and installing the compositor locally
prefix_path = get_option('prefix')
-message('prefix_path ' + prefix_path)
-if not prefix_path.contains('/usr')
- include_dir_str = join_paths(prefix_path, 'include')
- if not fs.is_dir(include_dir_str)
- error('Prefix path does not contain an include directory!')
- endif
- local_dep = declare_dependency(include_directories: include_dir_str)
-else
- local_dep = []
-endif
-
dir_data = join_paths(prefix_path, get_option('datadir'))
dir_data_agl_compositor = join_paths('agl-compositor', 'protocols')
dir_data_pc = join_paths(dir_data, 'pkgconfig')
deps_libweston = [
dependency('wayland-server'),
libweston_dep,
- dependency('libweston-desktop-8'),
- local_dep,
+ dependency('libweston-desktop-10'),
]
'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,
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
dependencies: deps_libweston,
install_dir: dir_module_agl_compositor,
install: true,
- version: '0.0.0',
+ version: meson.project_version(),
soversion: 0
)
common_inc = [ include_directories('src'), include_directories('.') ]
subdir('clients')
+
+if get_option('grpc-proxy')
+ subdir('grpc-proxy')
+endif