From 8103b5687479385b3b2ba0fe5eddb9e6ce6b50c4 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Tue, 25 Jun 2019 16:51:31 +0200 Subject: [PATCH] meson: fix building of svg / eet / json loader if its disabled the problem was that the savers are defining the same defines as the loaders. Because of me beeing paranoid, i would like to keep the double define, as later on, someone will likely forget it, and it does not do any harm here. this fixes ci. Reviewed-by: Stefan Schmidt Differential Revision: https://phab.enlightenment.org/D9174 --- src/modules/evas/vg_savers/meson.build | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/modules/evas/vg_savers/meson.build b/src/modules/evas/vg_savers/meson.build index 414a695c27..3fef5863b3 100644 --- a/src/modules/evas/vg_savers/meson.build +++ b/src/modules/evas/vg_savers/meson.build @@ -2,13 +2,16 @@ evas_vg_savers_file = ['eet', 'svg'] foreach loader : evas_vg_savers_file file = join_paths(loader, 'evas_vg_save_'+loader+'.c') - tmp = static_library('vg_saver_'+loader, file, - include_directories : config_dir, - dependencies: [eo, ector, emile, freetype, eet, evas_pre], - ) - evas_static_list += [declare_dependency( - sources: file, - dependencies: [eo, ector, emile, freetype, eet, evas_pre], - )] - config_h.set('EVAS_STATIC_BUILD_VG_'+loader.to_upper(), '1') -endforeach \ No newline at end of file + + if (get_option('evas-loaders-disabler').contains(loader) == false) + tmp = static_library('vg_saver_'+loader, file, + include_directories : config_dir, + dependencies: [eo, ector, emile, freetype, eet, evas_pre], + ) + evas_static_list += [declare_dependency( + sources: file, + dependencies: [eo, ector, emile, freetype, eet, evas_pre], + )] + config_h.set('EVAS_STATIC_BUILD_VG_'+loader.to_upper(), '1') + endif +endforeach