X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=0958f06bd061a8db450f7fa02cd2311fcee0132e;hb=0b766cf978b8b100caecd4c61464e1a683685072;hp=4299d58f7358a82167f5ab3b764e57d7c38c0b09;hpb=991714fc7f92aea3d07c7225247a821e3461027e;p=src%2Fagl-compositor.git diff --git a/meson.build b/meson.build index 4299d58..0958f06 100644 --- a/meson.build +++ b/meson.build @@ -1,26 +1,27 @@ project('agl-compositor', - 'c', - version: '0.0.18', + 'c','cpp', + version: '0.0.20', default_options: [ 'warning_level=3', 'c_std=gnu99', + 'werror=true', ], - meson_version: '>= 0.47', + meson_version: '>= 0.53', license: 'MIT/Expat', ) config_h = configuration_data() -agl_compositor_version = '0.0.18' -libweston_version = 'libweston-8' +libweston_version = 'libweston-10' pkgconfig = import('pkgconfig') +fs = import('fs') cc = meson.get_compiler('c') +cxx = meson.get_compiler('cpp') + add_project_arguments( cc.get_supported_arguments([ '-Wno-unused-parameter', '-Wno-pedantic', - '-Wextra', - '-Werror' ]), language: 'c' ) @@ -42,7 +43,7 @@ endforeach dep_libsystemd = dependency('libsystemd', required: false) dep_libsmack = dependency('libsmack', required: false) -dep_scanner = dependency('wayland-scanner', native: true) +dep_scanner = dependency('wayland-scanner') prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) dep_wp = dependency('wayland-protocols', version: '>= 1.18') dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir') @@ -59,10 +60,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', 'waltham-transmitter', +] + +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') @@ -73,6 +93,7 @@ protocols = [ { 'name': 'agl-shell-desktop', 'source': 'internal' }, { 'name': 'agl-screenshooter', 'source': 'internal' }, { 'name': 'xdg-shell', 'source': 'wp-stable' }, + { 'name': 'xdg-output', 'source': 'unstable', 'version': 'v1' }, ] foreach proto: protocols @@ -112,14 +133,17 @@ 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 +# libweston pkg-config file already has 'libweston' as prefix but +# agl-compositor uses 'libweston' 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) + include_dir_str = join_paths(prefix_path, 'include') + if not fs.is_dir(include_dir_str) + error('Prefix path does not contain an include directory!') + endif + local_dep = declare_dependency(include_directories: include_dir_str) else local_dep = [] endif @@ -132,19 +156,22 @@ libweston_dep = dependency(libweston_version) deps_libweston = [ dependency('wayland-server'), libweston_dep, - dependency('libweston-desktop-8'), + dependency('libweston-desktop-10'), local_dep, ] + srcs_agl_compositor = [ - 'src/main.c', + 'src/compositor.c', 'src/desktop.c', 'src/layout.c', 'src/policy.c', 'src/shell.c', 'src/screenshooter.c', + 'src/input.c', 'shared/option-parser.c', 'shared/os-compatibility.c', + 'shared/process-util.c', agl_shell_server_protocol_h, agl_shell_desktop_server_protocol_h, agl_screenshooter_server_protocol_h, @@ -161,23 +188,40 @@ 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 - # 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_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') + dir_path_headless_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-headless.h') + else + dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h') + dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-headless.h') + endif else + message('Building with cross environment') dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h') + dir_path_headless_backend = join_paths(libweston_version, 'libweston', 'backend-headless.h') endif # do the test if cc.has_header(dir_path_x11_backend) config_h.set('HAVE_BACKEND_X11', 1) + message('Building with X11 backend') + endif + + if cc.has_header(dir_path_headless_backend) + config_h.set('HAVE_BACKEND_HEADLESS', 1) + message('Building with headless backend') endif endif @@ -195,24 +239,48 @@ 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 endif +dir_module_agl_compositor = join_paths(join_paths(prefix_path, get_option('libdir')), 'agl-compositor') + +libexec_compositor = shared_library( + 'exec_compositor', + sources: srcs_agl_compositor, + dependencies: deps_libweston, + install_dir: dir_module_agl_compositor, + install: true, + version: '0.0.0', + soversion: 0 +) + +dep_libexec_compositor = declare_dependency( + link_with: libexec_compositor, + include_directories: [ include_directories('.') ], + dependencies: deps_libweston, +) + configure_file(output: 'config.h', configuration: config_h) exe_agl_compositor = executable( 'agl-compositor', - srcs_agl_compositor, - dependencies: deps_libweston, + 'src/main.c', + dependencies: dep_libexec_compositor, + install_rpath: dir_module_agl_compositor, install: true ) pkgconfig.generate( - filebase: 'agl-compositor-@0@-protocols'.format(agl_compositor_version), + filebase: 'agl-compositor-@0@-protocols'.format(meson.project_version()), name: 'agl-compositor private protocols', - version: agl_compositor_version, + version: meson.project_version(), description: 'agl-compositor protocol files', variables: [ 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), @@ -225,3 +293,6 @@ install_data( [ agl_shell_xml, agl_shell_desktop_xml ], install_dir: join_paths(dir_data, dir_data_agl_compositor) ) + +common_inc = [ include_directories('src'), include_directories('.') ] +subdir('clients')