From 9d3e0000b2f9ee79d5204874a0c78eb9ff5f515a Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sat, 17 Nov 2018 11:45:03 +0000 Subject: [PATCH] meson - fix ecore imf scim build to detect scim fully and work again --- src/modules/ecore_imf/scim/meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/ecore_imf/scim/meson.build b/src/modules/ecore_imf/scim/meson.build index c1bf1d23fd..102c631281 100644 --- a/src/modules/ecore_imf/scim/meson.build +++ b/src/modules/ecore_imf/scim/meson.build @@ -3,8 +3,13 @@ mod_src = files([ 'scim_imcontext.cpp', 'scim_imcontext.h' ]) -mod_deps = [ecore, ecore_imf, ecore_x, dependency('scim-1.0'), dependency('glib-2.0')] +scim_dep = dependency('scim') +if not scim_dep.found() + scim_dep = dependency('scim-1.0') +endif + +mod_deps = [ecore, ecore_imf, ecore_x, ecore_evas, scim_dep, dependency('glib-2.0')] shared_module(mod_name, mod_src,