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

diff --git a/meson.build b/meson.build
index 08548f8..e1ba3c1 100644
--- a/meson.build
+++ b/meson.build
@@ -9,11 +9,17 @@ project('agl-compositor',
   license: 'MIT/Expat',
 )
 
+config_h = configuration_data()
+agl_compositor_version = '0.0.13'
+pkgconfig = import('pkgconfig')
+
 cc = meson.get_compiler('c')
 add_project_arguments(
   cc.get_supported_arguments([
     '-Wno-unused-parameter',
     '-Wno-pedantic',
+    '-Wextra',
+    '-Werror'
   ]),
   language: 'c'
 )
@@ -33,9 +39,10 @@ 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')
+dep_wp = dependency('wayland-protocols', version: '>= 1.18')
 dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir')
 
 agl_shell_xml = files('protocol/agl-shell.xml')
@@ -83,10 +90,28 @@ 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
+
+dir_data = join_paths(prefix_path, get_option('datadir'))
+dir_data_agl_compositor = join_paths('agl-compositor', 'protocols')
+dir_data_pc = join_paths(dir_data, 'pkgconfig')
+libweston_dep = dependency('libweston-7')
+
 deps_libweston = [
   dependency('wayland-server'),
-  dependency('libweston-6'),
-  dependency('libweston-desktop-6'),
+  libweston_dep,
+  dependency('libweston-desktop-7'),
+  local_dep,
 ]
 
 srcs_agl_compositor = [
@@ -101,9 +126,54 @@ srcs_agl_compositor = [
 	xdg_shell_protocol_c,
 ]
 
+# From meson documentation:
+# In order to look for headers in a specific directory you can use args :
+# '-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-7', 'libweston', 'backend-x11.h')
+  else
+    dir_path_x11_backend = join_paths('libweston-7', 'libweston', 'backend-x11.h')
+  endif
+
+  # do the test
+  if cc.has_header(dir_path_x11_backend)
+    config_h.set('HAVE_BACKEND_X11', 1)
+  endif
+endif
+
+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,
 	dependencies: deps_libweston,
 	install: true
 )
+
+pkgconfig.generate(
+        filebase: 'agl-compositor-@0@-protocols'.format(agl_compositor_version),
+        name: 'agl-compositor private protocols',
+        version: agl_compositor_version,
+        description: 'agl-compositor protocol files',
+        variables: [
+                'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
+                'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', dir_data_agl_compositor)
+        ],
+        install_dir: dir_data_pc
+)
+
+install_data(
+        [ agl_shell_xml ],
+        install_dir: join_paths(dir_data, dir_data_agl_compositor)
+)