summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-11-06 06:32:19 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-11-06 06:32:36 -0500
commitc1a3ec99403402c156af1ecc3c827ef6b8550cff (patch)
tree6754257d5b52ddcca58a3216c7358039acc4c26d /src/modules
parent4f5067dde971b0f487de469c9bcefaff9157ba4a (diff)
improve meson build module disabling
ref 61ddcb25e6075e5e6a5436dc6f981e45317c5d7d
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/meson.build8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 01e335f..65f0b2f 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -78,6 +78,7 @@ mods = [
78 78
79foreach m: mods 79foreach m: mods
80 desktop_only = false 80 desktop_only = false
81 disable = false
81 no_icon = false 82 no_icon = false
82 cargs = '' 83 cargs = ''
83 data = [] 84 data = []
@@ -87,13 +88,14 @@ foreach m: mods
87 _dir_bin = join_paths(_dir, module_arch) 88 _dir_bin = join_paths(_dir, module_arch)
88 89
89 opt = '-'.join(m.split('_')) 90 opt = '-'.join(m.split('_'))
90 disable = get_option(opt)
91 91
92 if disable == true 92 if get_option(opt) == true
93 subdir(m) 93 subdir(m)
94 else
95 disable = true
94 endif 96 endif
95 97
96 if disable == true 98 if disable == false
97 99
98 _inc2 = [] 100 _inc2 = []
99 foreach i: inc 101 foreach i: inc