X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=bdec8fd7c7f4e1debd6878c5493af7a319468282;hb=d98b08f1fcb6ff6ccc762f149c8aa53a6921ad60;hp=bc8961dc3d09eadfb5962393bc9a479fde515dcf;hpb=c0bc469e505b91e006cb54bc98a9215614be2b52;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index bc8961d..bdec8fd 100644
--- a/meson.build
+++ b/meson.build
@@ -1,16 +1,17 @@
 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')
 
@@ -21,8 +22,6 @@ add_project_arguments(
   cc.get_supported_arguments([
     '-Wno-unused-parameter',
     '-Wno-pedantic',
-    '-Wextra',
-    '-Werror'
   ]),
   language: 'c'
 )
@@ -44,7 +43,7 @@ endforeach
 
 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')
@@ -157,7 +156,7 @@ libweston_dep = dependency(libweston_version)
 deps_libweston = [
   dependency('wayland-server'),
   libweston_dep,
-  dependency('libweston-desktop-8'),
+  dependency('libweston-desktop-10'),
   local_dep,
 ]
 
@@ -172,6 +171,7 @@ srcs_agl_compositor = [
 	'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,
@@ -239,7 +239,9 @@ if deps_remoting.length() == depnames.length()
   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
@@ -257,7 +259,7 @@ libexec_compositor = shared_library(
         dependencies: deps_libweston,
         install_dir: dir_module_agl_compositor,
         install: true,
-        version: '0.0.0',
+        version: meson.project_version(),
         soversion: 0
 )
 
@@ -296,3 +298,7 @@ install_data(
 
 common_inc = [ include_directories('src'), include_directories('.') ]
 subdir('clients')
+
+if get_option('grpc-proxy')
+  subdir('grpc-proxy')
+endif