summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2019-11-22 12:16:50 +0100
committerSamuel Pitoiset <[email protected]>2019-11-25 07:51:56 +0000
commitd6db858771ab72f607e43cd2cacf73b2f62fad30 (patch)
treeba939ea1da47b1d05f3a4c4f2c30057646517292 /src
parentbfb307aea922218cb72ffc9d977e88dfcadb2daf (diff)
meson: only build imgui when needed
Only required for Intel tools or the Vulkan overlay layer. Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/intel/meson.build2
-rw-r--r--src/meson.build4
-rw-r--r--src/vulkan/meson.build2
3 files changed, 5 insertions, 3 deletions
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