[igt-dev] [PATCH i-g-t v2] meson: Add option to not build the assembler

[Petri Latvala]

New option -Dassembler=disabled will omit assembler/ from the build.

v2: Use "not .disabled()" instead of ".enabled" so the default value
    of auto builds the assembler. (Arek)

Signed-off-by: Petri Latvala <petri.latvala at intel.com>
Cc: Kalyan Kondapally <kalyan.kondapally at intel.com>
Cc: Arkadiusz Hiler <arek at hiler.eu>
Cc: Lukasz Fiedorowicz <lukasz.fiedorowicz at intel.com>
---
 meson.build       | 4 +++-
 meson_options.txt | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index f4ee14f1..cb9ebca1 100644
--- a/meson.build
+++ b/meson.build
@@ -82,6 +82,7 @@ endforeach
 build_chamelium = get_option('chamelium')
 build_docs = get_option('docs')
 build_tests = not get_option('tests').disabled()
+build_assembler = not get_option('assembler').disabled()
 with_libdrm = get_option('libdrm_drivers')
 
 build_info = ['Build type: ' + get_option('buildtype')]
@@ -306,9 +307,10 @@ build_info += 'Build tests: @0@'.format(build_tests)
 subdir('benchmarks')
 subdir('tools')
 subdir('runner')
-if libdrm_intel.found()
+if libdrm_intel.found() and build_assembler
 	subdir('assembler')
 endif
+build_info += 'Build shader assembler: @0@'.format(build_assembler)
 subdir('overlay')
 subdir('man')
 
diff --git a/meson_options.txt b/meson_options.txt
index ff3abf08..6f0b9252 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -42,6 +42,10 @@ option('runner',
        type : 'feature',
        description : 'Build test runner')
 
+option('assembler',
+       type : 'feature',
+       description : 'Build shader assembler')
+
 option('oping',
        type : 'feature',
        description : 'Build test runner with liboping for pinging support')
-- 
2.20.1