meson: only build imgui when needed

Only required for Intel tools or the Vulkan overlay layer.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Samuel Pitoiset 2019-11-22 12:16:50 +01:00
parent bfb307aea9
commit d6db858771
4 changed files with 9 additions and 3 deletions

View file

@ -53,6 +53,7 @@ with_glx_read_only_text = get_option('glx-read-only-text')
with_glx_direct = get_option('glx-direct') with_glx_direct = get_option('glx-direct')
with_osmesa = get_option('osmesa') with_osmesa = get_option('osmesa')
with_swr_arches = get_option('swr-arches') with_swr_arches = get_option('swr-arches')
with_vulkan_overlay_layer = get_option('vulkan-overlay-layer')
with_tools = get_option('tools') with_tools = get_option('tools')
if with_tools.contains('all') if with_tools.contains('all')
with_tools = [ with_tools = [
@ -69,6 +70,9 @@ if with_tools.contains('all')
] ]
endif endif
with_intel_tools = with_tools.contains('intel') or with_tools.contains('intel-ui')
with_imgui = with_intel_tools or with_vulkan_overlay_layer
dri_drivers_path = get_option('dri-drivers-path') dri_drivers_path = get_option('dri-drivers-path')
if dri_drivers_path == '' if dri_drivers_path == ''
dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri') dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri')

View file

@ -28,7 +28,7 @@ subdir('isl')
subdir('common') subdir('common')
subdir('compiler') subdir('compiler')
subdir('perf') subdir('perf')
if with_tools.contains('intel') or with_tools.contains('intel-ui') if with_intel_tools
subdir('tools') subdir('tools')
endif endif
if with_intel_vk if with_intel_vk

View file

@ -60,7 +60,9 @@ subdir('compiler')
if with_tools.contains('drm-shim') if with_tools.contains('drm-shim')
subdir('drm-shim') subdir('drm-shim')
endif endif
subdir('imgui') if with_imgui
subdir('imgui')
endif
if with_platform_wayland if with_platform_wayland
subdir('egl/wayland/wayland-drm') subdir('egl/wayland/wayland-drm')
endif endif

View file

@ -59,6 +59,6 @@ endif
subdir('util') subdir('util')
subdir('wsi') subdir('wsi')
if get_option('vulkan-overlay-layer') if with_vulkan_overlay_layer
subdir('overlay-layer') subdir('overlay-layer')
endif endif