From 15ff22c7459991276a42fad16d5dc8de70ff6171 Mon Sep 17 00:00:00 2001 From: Minze Zwerver Date: Sun, 2 Jun 2019 12:31:51 +0200 Subject: [PATCH] added option to disable building the utils When you need both 32 and 64 bit version of the library only one version of the utils is required. --- meson.build | 8 ++++++-- meson_options.txt | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index c6f3032..856de4a 100644 --- a/meson.build +++ b/meson.build @@ -125,6 +125,7 @@ path_polkit_action_dir = join_paths(path_datadir, 'polkit-1', 'actions') with_daemon = get_option('with-daemon') with_examples = get_option('with-examples') +with_util = get_option('with-util') # Provide a config.h cdata = configuration_data() @@ -142,8 +143,11 @@ subdir('lib') # common lib is always required subdir('common') -# Utilities are always required -subdir('util') +# Utilities are always required except when having both 64 and 32 bit versions +# of libgamemode installed +if with_util == true + subdir('util') +endif # The daemon can be disabled if necessary, allowing multilib builds of the # main library diff --git a/meson_options.txt b/meson_options.txt index 9881031..ef329a3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -12,3 +12,4 @@ option('with-dbus-service-dir', type: 'string', description: 'Explicitly set the # General options option('with-examples', type: 'boolean', description: 'Build sample programs', value: 'true') option('with-daemon', type: 'boolean', description: 'Build the daemon', value: 'true') +option('with-util', type: 'boolean', description: 'Build the utilities', value: 'true')