summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-28 08:27:37 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-28 13:09:23 +0200
commite1ea935daea28115ea610927035db00244386df5 (patch)
tree902470b5654f8bb2ab776dd52733a21184c8322a
parentf6d20e1f967a1a0ccd88d15af565a313a3c870f6 (diff)
build: split off static parts from external parts in evas
this way we can use that list easily in the modules, and keep the list for later module building. Differential Revision: https://phab.enlightenment.org/D11897
-rw-r--r--src/lib/evas/meson.build23
-rw-r--r--src/modules/evas/engines/meson.build2
-rw-r--r--src/modules/evas/image_loaders/meson.build2
-rw-r--r--src/modules/evas/image_savers/meson.build2
4 files changed, 16 insertions, 13 deletions
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index d923cee0df..d9f88afa42 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -49,7 +49,8 @@ evas_vg_savers_file = ['eet', 'svg']
49 49
50rel_evas_modules = join_paths('..', '..', '..', 'modules', 'evas', 'engines', 'software_generic') 50rel_evas_modules = join_paths('..', '..', '..', 'modules', 'evas', 'engines', 'software_generic')
51evas_deps = [eo, eet, eina, efl, emile, ector, ecore, draw, buildsystem] 51evas_deps = [eo, eet, eina, efl, emile, ector, ecore, draw, buildsystem]
52evas_ext_deps = [buildsystem_simple, intl, m, draw_simple, valgrind, libunibreak, lua, vg_common] 52evas_ext_deps = []
53evas_ext_none_static_deps = [buildsystem_simple, intl, m, draw_simple, valgrind, libunibreak, lua, vg_common]
53 54
54pub_eo_file_target = [] 55pub_eo_file_target = []
55priv_eo_files = [] 56priv_eo_files = []
@@ -138,16 +139,16 @@ evas_src += files([
138 139
139evas_src_opt = [ ] 140evas_src_opt = [ ]
140 141
141evas_ext_deps += dependency('freetype2') 142evas_ext_none_static_deps += dependency('freetype2')
142 143
143if (get_option('fontconfig')) 144if (get_option('fontconfig'))
144 config_h.set('HAVE_FONTCONFIG', '1') 145 config_h.set('HAVE_FONTCONFIG', '1')
145 evas_ext_deps += dependency('fontconfig') 146 evas_ext_none_static_deps += dependency('fontconfig')
146endif 147endif
147 148
148if (get_option('fribidi')) 149if (get_option('fribidi'))
149 config_h.set('HAVE_FRIBIDI', '1') 150 config_h.set('HAVE_FRIBIDI', '1')
150 evas_ext_deps += dependency('fribidi') 151 evas_ext_none_static_deps += dependency('fribidi')
151endif 152endif
152 153
153if (get_option('pixman')) 154if (get_option('pixman'))
@@ -155,16 +156,16 @@ if (get_option('pixman'))
155 foreach support : pixman_support 156 foreach support : pixman_support
156 config_h.set(support, '1') 157 config_h.set(support, '1')
157 endforeach 158 endforeach
158 evas_ext_deps += dependency('pixman-1') 159 evas_ext_none_static_deps += dependency('pixman-1')
159endif 160endif
160 161
161if (get_option('hyphen')) 162if (get_option('hyphen'))
162 config_h.set('HAVE_HYPHEN', '1') 163 config_h.set('HAVE_HYPHEN', '1')
163 hyphen = dependency('hyphen', required : false) 164 hyphen = dependency('hyphen', required : false)
164 if hyphen.found() == false 165 if hyphen.found() == false
165 evas_ext_deps += cc.find_library('hyphen') 166 evas_ext_none_static_deps += cc.find_library('hyphen')
166 endif 167 endif
167 evas_ext_deps += hyphen 168 evas_ext_none_static_deps += hyphen
168 config_h.set_quoted('EVAS_DICTS_HYPHEN_DIR', get_option('dictionaries-hyphen-dir')) 169 config_h.set_quoted('EVAS_DICTS_HYPHEN_DIR', get_option('dictionaries-hyphen-dir'))
169endif 170endif
170 171
@@ -180,12 +181,12 @@ subdir('vg')
180gl_deps = [] 181gl_deps = []
181 182
182if get_option('harfbuzz') 183if get_option('harfbuzz')
183 evas_ext_deps += dependency('harfbuzz') 184 evas_ext_none_static_deps += dependency('harfbuzz')
184 config_h.set('HAVE_HARFBUZZ', '1') 185 config_h.set('HAVE_HARFBUZZ', '1')
185endif 186endif
186 187
187if get_option('wl') 188if get_option('wl')
188 evas_ext_deps += wayland_protocol 189 evas_ext_none_static_deps += wayland_protocol
189endif 190endif
190 191
191 192
@@ -210,7 +211,7 @@ if cpu_sse3 == true or cpu_neon == true and cpu_neon_intrinsics == false
210 evas_include_directories + 211 evas_include_directories +
211 [vg_common_inc_dir], 212 [vg_common_inc_dir],
212 c_args: native_arch_opt_c_args, 213 c_args: native_arch_opt_c_args,
213 dependencies: [eina, eo, ector, emile, evas_deps, evas_ext_deps], 214 dependencies: [eina, eo, ector, emile, evas_deps, evas_ext_none_static_deps],
214 ) 215 )
215 evas_link += [ evas_opt ] 216 evas_link += [ evas_opt ]
216endif 217endif
@@ -284,6 +285,8 @@ evas_ext_deps += declare_dependency(
284 link_with: evas_link, 285 link_with: evas_link,
285) 286)
286 287
288evas_ext_deps += evas_ext_none_static_deps
289
287evas_lib = library('evas', 290evas_lib = library('evas',
288 include_directories: evas_include_directories + [vg_common_inc_dir], 291 include_directories: evas_include_directories + [vg_common_inc_dir],
289 sources : [evas_src, pub_eo_file_target, priv_eo_file_target], 292 sources : [evas_src, pub_eo_file_target, priv_eo_file_target],
diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build
index 1efdbbddc8..c7e4255d9c 100644
--- a/src/modules/evas/engines/meson.build
+++ b/src/modules/evas/engines/meson.build
@@ -46,7 +46,7 @@ foreach engine_conf : engines
46 if build 46 if build
47 engine_include_dir = [] 47 engine_include_dir = []
48 engine_src = [] 48 engine_src = []
49 engine_deps = [eina, evas, evas_ext_deps] 49 engine_deps = [eina, evas, evas_ext_none_static_deps, eet]
50 engine_dep = declare_dependency( 50 engine_dep = declare_dependency(
51 include_directories: include_directories(engine), 51 include_directories: include_directories(engine),
52 ) 52 )
diff --git a/src/modules/evas/image_loaders/meson.build b/src/modules/evas/image_loaders/meson.build
index 963245ecfe..11b11f79c2 100644
--- a/src/modules/evas/image_loaders/meson.build
+++ b/src/modules/evas/image_loaders/meson.build
@@ -11,7 +11,7 @@ foreach loader_inst : evas_image_loaders_file
11 shared_module('shared_loader_'+loader, file, 11 shared_module('shared_loader_'+loader, file,
12 c_args : package_c_args, 12 c_args : package_c_args,
13 include_directories : config_dir, 13 include_directories : config_dir,
14 dependencies : [eina, evas, evas_ext_deps] + loader_deps, 14 dependencies : [eina, evas, eet, evas_ext_none_static_deps] + loader_deps,
15 install : true, 15 install : true,
16 install_dir : mod_install_dir, 16 install_dir : mod_install_dir,
17 name_suffix : sys_mod_extension 17 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/image_savers/meson.build b/src/modules/evas/image_savers/meson.build
index 7a5ebcb3b3..e30a05fe3b 100644
--- a/src/modules/evas/image_savers/meson.build
+++ b/src/modules/evas/image_savers/meson.build
@@ -11,7 +11,7 @@ foreach loader_inst : evas_image_savers_file
11 shared_module('shared_saver_'+loader, file, 11 shared_module('shared_saver_'+loader, file,
12 c_args : package_c_args, 12 c_args : package_c_args,
13 include_directories : config_dir, 13 include_directories : config_dir,
14 dependencies : [eina, evas, eet, evas_ext_deps] + loader_deps, 14 dependencies : [eina, evas, eet, evas_ext_none_static_deps] + loader_deps,
15 install : true, 15 install : true,
16 install_dir : mod_install_dir, 16 install_dir : mod_install_dir,
17 name_suffix : sys_mod_extension 17 name_suffix : sys_mod_extension