X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=meson.build;h=11ee2c17c26fad0d872cd522ee509450b75f5499;hb=refs%2Ftags%2F11.0.3;hp=34f85586bc1bce9a910ddf693801421bee60b0e9;hpb=a30af04e6f81514149ef589ecfe71ec80c34e10a;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index 34f8558..11ee2c1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('agl-compositor',
-  'c',
+  'c','cpp',
   version: '0.0.18',
   default_options: [
     'warning_level=3',
@@ -15,6 +15,8 @@ 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',
@@ -73,10 +75,11 @@ depnames_waltham = [
 deps_waltham = []
 foreach depname : depnames_waltham
   dep = dependency(depname, required: false)
-  if not dep.found()
+  if dep.found()
+    deps_waltham += dep
+  else
     message('Waltham requires @0@ which was not found. '.format(depname))
   endif
-  deps_waltham += dep
 endforeach
 
 deps_waltham += deps_remoting
@@ -181,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
 
 
@@ -189,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