summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Houston <smhouston88@gmail.com>2017-12-06 09:08:43 -0600
committerStephen Houston <smhouston88@gmail.com>2017-12-06 09:08:43 -0600
commit8f06b9d6f5dfd03a934c7bb1e500e4851b5ebcc9 (patch)
treefdc8d187a691104af2ffea27dd965e8929ac1cc2
parent60b4350490f58288745d9d078585422f7196297c (diff)
The E dep for sandbox gadget is not required, don't make it so.
-rw-r--r--data/desktop/meson.build13
-rw-r--r--meson.build3
2 files changed, 10 insertions, 6 deletions
diff --git a/data/desktop/meson.build b/data/desktop/meson.build
index 80289ac..fce7eef 100644
--- a/data/desktop/meson.build
+++ b/data/desktop/meson.build
@@ -12,9 +12,10 @@ if host_os == 'linux'
12 host_os = 'linux-gnu' 12 host_os = 'linux-gnu'
13 endif 13 endif
14endif 14endif
15dep_e = dependency('enlightenment') 15if (build_gadget == true)
16release = dep_e.get_pkgconfig_variable('release') 16 release = depe.get_pkgconfig_variable('release')
17module_arch = '@0@-@1@-@2@'.format(host_os, host_machine.cpu_family(), release) 17 module_arch = '@0@-@1@-@2@'.format(host_os, host_machine.cpu_family(), release)
18dir_gadgets = join_paths([dir_lib, 'enlightenment/gadgets', module_arch]) 18 dir_gadgets = join_paths([dir_lib, 'enlightenment/gadgets', module_arch])
19install_data('slideshow.desktop', 19 install_data('slideshow.desktop',
20 install_dir: join_paths([dir_gadgets, 'slideshow'])) 20 install_dir: join_paths([dir_gadgets, 'slideshow']))
21endif
diff --git a/meson.build b/meson.build
index 2f9ae60..ef78b83 100644
--- a/meson.build
+++ b/meson.build
@@ -11,6 +11,8 @@ proj = meson.project_name()
11ver = meson.project_version() 11ver = meson.project_version()
12cfg = configuration_data() 12cfg = configuration_data()
13 13
14build_gadget = false
15
14##### dependencies 16##### dependencies
15efl_version = '>= 1.19.0' 17efl_version = '>= 1.19.0'
16elm = dependency('elementary', required: true, version: efl_version) 18elm = dependency('elementary', required: true, version: efl_version)
@@ -67,6 +69,7 @@ if exif.found() == true
67 cfg.set ('HAVE_LIBEXIF' , 1) 69 cfg.set ('HAVE_LIBEXIF' , 1)
68endif 70endif
69if depe.found() == true 71if depe.found() == true
72 build_gadget = true
70 cfg.set ('HAVE_E' , 1) 73 cfg.set ('HAVE_E' , 1)
71endif 74endif
72##### translations 75##### translations