diff options
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | meson_options.txt | 1 | ||||
| -rw-r--r-- | util/meson.build | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 8eb65a8ae..065578e48 100644 --- a/meson.build +++ b/meson.build @@ -489,7 +489,9 @@ executable( link_with : libflashrom.get_static_lib(), # flashrom needs internal symbols of libflashrom ) -subdir('util') +if get_option('ich_descriptors_tool').auto() or get_option('ich_descriptors_tool').enabled() + subdir('util/ich_descriptors_tool') +endif # Use `.auto() or .enabled()` instead of `.allowed()` to keep the minimum meson version as low as possible. # `.allowed()` gets introduced in 0.59.0 diff --git a/meson_options.txt b/meson_options.txt index 3d37914ba..284bfba9a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,6 +3,7 @@ option('usb', type : 'boolean', value : true, description : 'use libusb1') option('print_wiki', type : 'boolean', value : true, description : 'Print Wiki') option('default_programmer_name', type : 'string', description : 'default programmer') option('default_programmer_args', type : 'string', description : 'default programmer arguments') +option('ich_descriptors_tool', type : 'feature', value : 'auto', description : 'Build ich_descriptors_tool') option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers') option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller') diff --git a/util/meson.build b/util/meson.build deleted file mode 100644 index 24278d73f..000000000 --- a/util/meson.build +++ /dev/null @@ -1 +0,0 @@ -subdir('ich_descriptors_tool') |