summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-06-25 16:51:31 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2019-06-25 17:19:08 +0200
commit8103b5687479385b3b2ba0fe5eddb9e6ce6b50c4 (patch)
tree37c28b5c5049310ae831b62b2389830b6656cf8f
parent1d2301818cc095a87110827e6f0b141949162efc (diff)
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 <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D9174
Diffstat (limited to '')
-rw-r--r--src/modules/evas/vg_savers/meson.build23
1 files 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']
2 2
3foreach loader : evas_vg_savers_file 3foreach loader : evas_vg_savers_file
4 file = join_paths(loader, 'evas_vg_save_'+loader+'.c') 4 file = join_paths(loader, 'evas_vg_save_'+loader+'.c')
5 tmp = static_library('vg_saver_'+loader, file, 5
6 include_directories : config_dir, 6 if (get_option('evas-loaders-disabler').contains(loader) == false)
7 dependencies: [eo, ector, emile, freetype, eet, evas_pre], 7 tmp = static_library('vg_saver_'+loader, file,
8 ) 8 include_directories : config_dir,
9 evas_static_list += [declare_dependency( 9 dependencies: [eo, ector, emile, freetype, eet, evas_pre],
10 sources: file, 10 )
11 dependencies: [eo, ector, emile, freetype, eet, evas_pre], 11 evas_static_list += [declare_dependency(
12 )] 12 sources: file,
13 config_h.set('EVAS_STATIC_BUILD_VG_'+loader.to_upper(), '1') 13 dependencies: [eo, ector, emile, freetype, eet, evas_pre],
14endforeach \ No newline at end of file 14 )]
15 config_h.set('EVAS_STATIC_BUILD_VG_'+loader.to_upper(), '1')
16 endif
17endforeach