X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=294d82f704b0b16d20b53e8e1138c963e8d17884;hb=refs%2Ftags%2Ficefish_9.0.0;hp=08548f85c5e315ce4e28301231d08d571e8a31d5;hpb=2d7243208d3e455decd730e7e33ab2452b1a0508;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index 08548f8..294d82f 100644
--- a/meson.build
+++ b/meson.build
@@ -9,11 +9,15 @@ project('agl-compositor',
   license: 'MIT/Expat',
 )
 
+config_h = configuration_data()
+
 cc = meson.get_compiler('c')
 add_project_arguments(
   cc.get_supported_arguments([
     '-Wno-unused-parameter',
     '-Wno-pedantic',
+    '-Wextra',
+    '-Werror'
   ]),
   language: 'c'
 )
@@ -33,6 +37,7 @@ foreach func: optional_libc_funcs
     endif
 endforeach
 
+dep_libsystemd = dependency('libsystemd', required: false)
 dep_scanner = dependency('wayland-scanner', native: true)
 prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
 dep_wp = dependency('wayland-protocols', version: '>= 1.12')
@@ -83,10 +88,23 @@ foreach proto: protocols
     endforeach
 endforeach
 
+# libweston-6 pkg-config file already has 'libweston-6' as prefix but
+# agl-compositor uses 'libweston-6' 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')
+  additional_include_dir = include_directories(prefix_path + '/' + 'include')
+  local_dep = declare_dependency(include_directories: additional_include_dir)
+else
+  local_dep = []
+endif
+
 deps_libweston = [
   dependency('wayland-server'),
   dependency('libweston-6'),
   dependency('libweston-desktop-6'),
+  local_dep,
 ]
 
 srcs_agl_compositor = [
@@ -101,6 +119,17 @@ srcs_agl_compositor = [
 	xdg_shell_protocol_c,
 ]
 
+if dep_libsystemd.found()
+  config_h.set('HAVE_SYSTEMD', 1)
+
+  srcs_agl_compositor += 'src/systemd-notify.c'
+  deps_libweston += dep_libsystemd
+
+  message('Found systemd, enabling notify support')
+endif
+
+configure_file(output: 'config.h', configuration: config_h)
+
 exe_agl_compositor = executable(
 	'agl-compositor',
 	srcs_agl_compositor,