From 2801b45d8f7922650c85442a75d1f1a5b3ad62d3 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Thu, 12 Sep 2019 14:45:47 -0400 Subject: [PATCH] meson: make sure evas buffer engine is built before edje_cc Summary: ensure that the evas buffer engine is available. fix T8220 Reviewers: zmike Reviewed By: zmike Subscribers: zmike, cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T8220 Differential Revision: https://phab.enlightenment.org/D9918 --- src/bin/edje/meson.build | 2 +- src/modules/evas/engines/buffer/meson.build | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build index 5ba05d7c63..f33193d655 100644 --- a/src/bin/edje/meson.build +++ b/src/bin/edje/meson.build @@ -42,7 +42,7 @@ else env = find_program('env', native: true) edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()] endif - edje_depends = [edje_cc, epp] + edje_depends = [edje_cc, epp, evas_engine_buffer_mod] endif edje_decc_src = [ diff --git a/src/modules/evas/engines/buffer/meson.build b/src/modules/evas/engines/buffer/meson.build index 6bf791f150..ef42fd41bf 100644 --- a/src/modules/evas/engines/buffer/meson.build +++ b/src/modules/evas/engines/buffer/meson.build @@ -14,7 +14,7 @@ install_headers('Evas_Engine_Buffer.h', ) if get_option('evas-modules') == 'shared' - shared_module(mod_full_name, engine_src, + evas_engine_buffer_mod = shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir], dependencies : [eina, evas] + engine_deps, install : true, @@ -22,4 +22,6 @@ if get_option('evas-modules') == 'shared' name_suffix : sys_mod_extension ) module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + '.' + sys_mod_extension) +else + evas_engine_buffer_mod = [] endif