diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2019-11-22 12:16:50 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2019-11-25 07:51:56 +0000 |
| commit | d6db858771ab72f607e43cd2cacf73b2f62fad30 (patch) | |
| tree | ba939ea1da47b1d05f3a4c4f2c30057646517292 | |
| parent | bfb307aea922218cb72ffc9d977e88dfcadb2daf (diff) | |
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>
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/intel/meson.build | 2 | ||||
| -rw-r--r-- | src/meson.build | 4 | ||||
| -rw-r--r-- | src/vulkan/meson.build | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 9585807fbee..e8bec9bb389 100644 --- a/meson.build +++ b/meson.build @@ -53,6 +53,7 @@ with_glx_read_only_text = get_option('glx-read-only-text') with_glx_direct = get_option('glx-direct') with_osmesa = get_option('osmesa') with_swr_arches = get_option('swr-arches') +with_vulkan_overlay_layer = get_option('vulkan-overlay-layer') with_tools = get_option('tools') if with_tools.contains('all') with_tools = [ @@ -69,6 +70,9 @@ if with_tools.contains('all') ] 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') if dri_drivers_path == '' dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri') diff --git a/src/intel/meson.build b/src/intel/meson.build index 7b6aa40ba8d..528146f3bb7 100644 --- a/src/intel/meson.build +++ b/src/intel/meson.build @@ -28,7 +28,7 @@ subdir('isl') subdir('common') subdir('compiler') subdir('perf') -if with_tools.contains('intel') or with_tools.contains('intel-ui') +if with_intel_tools subdir('tools') endif if with_intel_vk diff --git a/src/meson.build b/src/meson.build index cefa1c9ac28..53b999ad22a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -60,7 +60,9 @@ subdir('compiler') if with_tools.contains('drm-shim') subdir('drm-shim') endif -subdir('imgui') +if with_imgui + subdir('imgui') +endif if with_platform_wayland subdir('egl/wayland/wayland-drm') endif diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build index 7900938b355..e1e8f753b50 100644 --- a/src/vulkan/meson.build +++ b/src/vulkan/meson.build @@ -59,6 +59,6 @@ endif subdir('util') subdir('wsi') -if get_option('vulkan-overlay-layer') +if with_vulkan_overlay_layer subdir('overlay-layer') endif |