summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-11-03 14:35:43 -0400
committerDerek Foreman <derekf@osg.samsung.com>2017-11-03 14:18:42 -0500
commit763c67a68d5a2249024d4b29af1922aa8a634988 (patch)
tree50f00cf42e307613550fc55f6e867678cde118c6 /src/modules
parent0688fbf7fecaa651a9949b9bdcccaacb21cf5ebc (diff)
check meson module option state before executing subdir
fix module disabling
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/meson.build10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 337ce9c..01e335f 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -79,7 +79,6 @@ mods = [
79foreach m: mods 79foreach m: mods
80 desktop_only = false 80 desktop_only = false
81 no_icon = false 81 no_icon = false
82 disable = false
83 cargs = '' 82 cargs = ''
84 data = [] 83 data = []
85 deps = [] 84 deps = []
@@ -87,11 +86,14 @@ foreach m: mods
87 _dir = join_paths(dir_module_e, m) 86 _dir = join_paths(dir_module_e, m)
88 _dir_bin = join_paths(_dir, module_arch) 87 _dir_bin = join_paths(_dir, module_arch)
89 88
90 subdir(m)
91
92 opt = '-'.join(m.split('_')) 89 opt = '-'.join(m.split('_'))
90 disable = get_option(opt)
91
92 if disable == true
93 subdir(m)
94 endif
93 95
94 if get_option(opt) == true and disable == false 96 if disable == true
95 97
96 _inc2 = [] 98 _inc2 = []
97 foreach i: inc 99 foreach i: inc