X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=82bb9909c35e7841ea778d2b7283cb1638312e8b;hb=65361f9f797905679c6c58c58733036911d54f7e;hp=6809579349f2938bc29aa2c6dffe36da09ef5bed;hpb=be8288cc5b127074fae6e2da052d6cd5cd623ae2;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index 6809579..82bb990 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
-  'c',
-  version: '0.0.18',
+  'c','cpp',
+  version: '0.0.19',
   default_options: [
     'warning_level=3',
     'c_std=gnu99',
@@ -10,11 +10,13 @@ project('agl-compositor',
 )
 
 config_h = configuration_data()
-agl_compositor_version = '0.0.18'
+agl_compositor_version = '0.0.19'
 libweston_version = 'libweston-8'
 pkgconfig = import('pkgconfig')
 
 cc = meson.get_compiler('c')
+cxx = meson.get_compiler('cpp')
+
 add_project_arguments(
   cc.get_supported_arguments([
     '-Wno-unused-parameter',
@@ -59,10 +61,29 @@ foreach depname : depnames
   if not dep.found()
     message('Remoting requires @0@ which was not found. '.format(depname))
   endif
-deps_remoting += dep
+  deps_remoting += dep
 endforeach
 
 
+# the transmitter plug-in requires waltham but we don't have a cflags or libs
+# for it so we add waltham depends here. Further more, the output is being
+# handled by remoting plug-in
+depnames_waltham = [
+  'waltham'
+]
+
+deps_waltham = []
+foreach depname : depnames_waltham
+  dep = dependency(depname, required: false)
+  if dep.found()
+    deps_waltham += dep
+  else
+    message('Waltham requires @0@ which was not found. '.format(depname))
+  endif
+endforeach
+
+deps_waltham += deps_remoting
+
 agl_shell_xml = files('protocol/agl-shell.xml')
 agl_shell_desktop_xml = files('protocol/agl-shell-desktop.xml')
 agl_screenshooter = files('protocol/agl-screenshooter.xml')
@@ -144,6 +165,7 @@ srcs_agl_compositor = [
 	'src/policy.c',
 	'src/shell.c',
 	'src/screenshooter.c',
+	'src/input.c',
 	'shared/option-parser.c',
 	'shared/os-compatibility.c',
 	agl_shell_server_protocol_h,
@@ -162,6 +184,10 @@ if policy_to_install == 'auto' or policy_to_install == 'allow-all'
 elif policy_to_install == 'deny-all'
   srcs_agl_compositor += 'src/policy-deny.c'
   message('Installing deny all policy')
+elif policy_to_install == 'rba'
+  srcs_agl_compositor += ['src/policy-rba.c', 'src/rba_adapter.cpp']
+  deps_libweston += dependency('librba')
+  message('Installing rba policy')
 endif
 
 
@@ -170,9 +196,14 @@ endif
 # '-I/extra/include/dir, but this should only be used in exceptional cases for
 # includes that can't be detected via pkg-config and passed via dependencies.
 if libweston_dep.found()
-  if not prefix_path.contains('/usr')
-    dir_path_x11_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-x11.h')
+  if not meson.is_cross_build()
+    if not prefix_path.contains('/usr')
+      dir_path_x11_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-x11.h')
+    else
+      dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h')
+    endif
   else
+    message('Building with cross environment')
     dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h')
   endif
 
@@ -196,6 +227,11 @@ if deps_remoting.length() == depnames.length()
   message('Found remoting depends, enabling remoting')
 endif
 
+if deps_waltham.length() == depnames_waltham.length() + depnames.length()
+  config_h.set('HAVE_WALTHAM', 1)
+  message('Found waltham depends, enabling waltham')
+endif
+
 if dep_libsmack.found()
   config_h.set('HAVE_SMACK', 1)
   deps_libweston += dep_libsmack