meson.build: Increase version of the compositor

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

diff --git a/meson.build b/meson.build
index c338ee6..08b2544 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
   'c',
-  version: '0.0.13',
+  version: '0.0.15',
   default_options: [
     'warning_level=3',
     'c_std=gnu99',
@@ -16,6 +16,8 @@ add_project_arguments(
   cc.get_supported_arguments([
     '-Wno-unused-parameter',
     '-Wno-pedantic',
+    '-Wextra',
+    '-Werror'
   ]),
   language: 'c'
 )
@@ -38,7 +40,7 @@ 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')
@@ -86,10 +88,25 @@ 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
+
+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 = [
@@ -104,6 +121,23 @@ 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)