shell: Don't reset the activation area always

[src/agl-compositor.git] / meson.build

diff --git a/meson.build b/meson.build
index 5f6c29d..bdec8fd 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,12 @@
 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',
 )
 
@@ -21,8 +22,6 @@ add_project_arguments(
   cc.get_supported_arguments([
     '-Wno-unused-parameter',
     '-Wno-pedantic',
-    '-Wextra',
-    '-Werror'
   ]),
   language: 'c'
 )
@@ -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