aboutsummaryrefslogtreecommitdiffstats
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
parentEphoto: Update libintl/nls/gettext handling and add a potfile. (diff)
downloadephoto-8f06b9d6f5dfd03a934c7bb1e500e4851b5ebcc9.tar.gz
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'
host_os = 'linux-gnu'
endif
endif
-dep_e = dependency('enlightenment')
-release = dep_e.get_pkgconfig_variable('release')
-module_arch = '@0@-@1@-@2@'.format(host_os, host_machine.cpu_family(), release)
-dir_gadgets = join_paths([dir_lib, 'enlightenment/gadgets', module_arch])
-install_data('slideshow.desktop',
- install_dir: join_paths([dir_gadgets, 'slideshow']))
+if (build_gadget == true)
+ release = depe.get_pkgconfig_variable('release')
+ module_arch = '@0@-@1@-@2@'.format(host_os, host_machine.cpu_family(), release)
+ dir_gadgets = join_paths([dir_lib, 'enlightenment/gadgets', module_arch])
+ install_data('slideshow.desktop',
+ install_dir: join_paths([dir_gadgets, 'slideshow']))
+endif
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()
ver = meson.project_version()
cfg = configuration_data()
+build_gadget = false
+
##### dependencies
efl_version = '>= 1.19.0'
elm = dependency('elementary', required: true, version: efl_version)
@@ -67,6 +69,7 @@ if exif.found() == true
cfg.set ('HAVE_LIBEXIF' , 1)
endif
if depe.found() == true
+ build_gadget = true
cfg.set ('HAVE_E' , 1)
endif
##### translations