meson build: only link with deps when required by options

This commit is contained in:
Dominique Martinet 2018-02-10 11:30:47 +01:00
parent 161ae2fcb4
commit 435aec0033
2 changed files with 21 additions and 17 deletions

View File

@ -27,6 +27,17 @@ backend_files = files(
'x11/backend.c', 'x11/backend.c',
) )
backend_deps = [
wayland_server,
egl,
gbm,
libinput,
wlr_render,
wlr_protos,
drm,
pixman,
]
if host_machine.system().startswith('freebsd') if host_machine.system().startswith('freebsd')
backend_files += files('session/direct-freebsd.c') backend_files += files('session/direct-freebsd.c')
else else
@ -35,26 +46,17 @@ endif
if conf_data.get('WLR_HAS_SYSTEMD', false) if conf_data.get('WLR_HAS_SYSTEMD', false)
backend_files += files('session/logind.c') backend_files += files('session/logind.c')
backend_deps += systemd
endif endif
if conf_data.get('WLR_HAS_ELOGIND', false) if conf_data.get('WLR_HAS_ELOGIND', false)
backend_files += files('session/logind.c') backend_files += files('session/logind.c')
backend_deps += elogind
endif endif
lib_wlr_backend = static_library( lib_wlr_backend = static_library(
'wlr_backend', 'wlr_backend',
backend_files, backend_files,
include_directories: wlr_inc, include_directories: wlr_inc,
dependencies: [ dependencies: backend_deps,
wayland_server,
egl,
gbm,
libinput,
systemd,
elogind,
wlr_render,
wlr_protos,
drm,
pixman,
],
) )

View File

@ -70,24 +70,28 @@ systemd = dependency('libsystemd', required: get_option('enable_systemd')
elogind = dependency('libelogind', required: get_option('enable_elogind') == 'true') elogind = dependency('libelogind', required: get_option('enable_elogind') == 'true')
math = cc.find_library('m', required: false) math = cc.find_library('m', required: false)
exclude_headers = []
wlr_parts = []
wlr_deps = []
if xcb_icccm.found() if xcb_icccm.found()
conf_data.set('WLR_HAS_XCB_ICCCM', true) conf_data.set('WLR_HAS_XCB_ICCCM', true)
endif endif
if libcap.found() and get_option('enable_libcap') != 'false' if libcap.found() and get_option('enable_libcap') != 'false'
conf_data.set('WLR_HAS_LIBCAP', true) conf_data.set('WLR_HAS_LIBCAP', true)
wlr_deps += libcap
endif endif
if systemd.found() and get_option('enable_systemd') != 'false' if systemd.found() and get_option('enable_systemd') != 'false'
conf_data.set('WLR_HAS_SYSTEMD', true) conf_data.set('WLR_HAS_SYSTEMD', true)
wlr_deps += systemd
endif endif
if elogind.found() and get_option('enable_elogind') != 'false' if elogind.found() and get_option('enable_elogind') != 'false'
conf_data.set('WLR_HAS_ELOGIND', true) conf_data.set('WLR_HAS_ELOGIND', true)
endif endif
exclude_headers = []
wlr_parts = []
if get_option('enable_xwayland') if get_option('enable_xwayland')
subdir('xwayland') subdir('xwayland')
wlr_parts += [lib_wlr_xwayland] wlr_parts += [lib_wlr_xwayland]
@ -117,7 +121,7 @@ wlr_parts += [
lib_wlr_xcursor, lib_wlr_xcursor,
] ]
wlr_deps = [ wlr_deps += [
wayland_server, wayland_server,
wayland_client, wayland_client,
wayland_egl, wayland_egl,
@ -133,8 +137,6 @@ wlr_deps = [
xcb, xcb,
xcb_composite, xcb_composite,
x11_xcb, x11_xcb,
libcap,
systemd,
math, math,
] ]