summaryrefslogtreecommitdiff
path: root/src/modules/evas/meson.build
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2019-01-30 16:06:50 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-01-30 18:16:47 +0100
commit4e0079eaa945c1401b99827a1ac623fdaedb3edd (patch)
treeb0c5e2f5039d98375cd01d7f02e8bd0ab6c3d92d /src/modules/evas/meson.build
parentaadd9af864a83d355b216ac3b2f293ca902a7b6f (diff)
meson: fix race condition in building
the error ``` ./src/modules/evas/engines/gl_generic/../software_generic/evas_ector_software.h:31:10: fatal error: 'evas_ector_software_buffer.eo.h' file not found ``` Came up when building efl on osx with meson. This is caused by the fact that gl_generic was build before the .eo files of evas_ector have been created in software_generic, this fixes this race condition by adding a new dependency to avoid that. Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D7831
Diffstat (limited to '')
-rw-r--r--src/modules/evas/meson.build6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/evas/meson.build b/src/modules/evas/meson.build
index e97ff1b2a0..fff385bc01 100644
--- a/src/modules/evas/meson.build
+++ b/src/modules/evas/meson.build
@@ -67,6 +67,12 @@ foreach engine_conf : engines
67 dependencies : [eina, evas_pre] + engine_deps, 67 dependencies : [eina, evas_pre] + engine_deps,
68 ) 68 )
69 69
70 if engine == 'software_generic'
71 software_generic = declare_dependency(
72 include_directories: engine_include_dir,
73 link_with : tmp
74 )
75 endif
70 if engine == 'gl_common' 76 if engine == 'gl_common'
71 #gl_common will only be used by gl_generic, NOT by libevas.so, so we work arround the static list 77 #gl_common will only be used by gl_generic, NOT by libevas.so, so we work arround the static list
72 gl_common = declare_dependency( 78 gl_common = declare_dependency(