diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build index 4d2a164dde..99f15ef6c7 100644 --- a/src/bin/edje/meson.build +++ b/src/bin/edje/meson.build @@ -38,7 +38,12 @@ endif if meson.is_cross_build() _edje_cc = find_program('edje_cc', native: true) - edje_cc_path = _edje_cc.path() + if meson.version().version_compare('>=0.55') + edje_cc_path = _edje_cc.full_path() + else + edje_cc_path = _edje_cc.path() + endif + edje_cc_exe = [_edje_cc] edje_depends = [] else @@ -94,7 +99,11 @@ edje_codegen = executable('edje_codegen', if meson.is_cross_build() _edje_codegen = find_program('edje_codegen', native: true) - edje_codegen_path = _edje_codegen.path() + if meson.version().version_compare('>=0.55') + edje_codegen_path = _edje_codegen.full_path() + else + edje_codegen_path = _edje_codegen.path() + endif edje_codegen_exe = [_edje_codegen] else edje_codegen_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_codegen] diff --git a/src/bin/elementary/meson.build b/src/bin/elementary/meson.build index 5254eb69ba..ade59c0fc6 100644 --- a/src/bin/elementary/meson.build +++ b/src/bin/elementary/meson.build @@ -255,7 +255,11 @@ elm_prefs_cc = executable('elm_prefs_cc', if meson.is_cross_build() _elm_prefs_cc = find_program('elm_prefs_cc', native: true) - elm_prefs_cc_path = _elm_prefs_cc.path() + if meson.version().version_compare('>=0.55') + elm_prefs_cc_path = _elm_prefs_cc.full_path() + else + elm_prefs_cc_path = _elm_prefs_cc.path() + endif elm_prefs_cc_exe = [_elm_prefs_cc] else elm_prefs_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elm_prefs_cc.full_path()] diff --git a/src/lib/eeze/meson.build b/src/lib/eeze/meson.build index 1435fe7a2f..5c4a085d59 100644 --- a/src/lib/eeze/meson.build +++ b/src/lib/eeze/meson.build @@ -73,7 +73,11 @@ foreach option : options_to_check endif prog = find_program(_option, required: false) if prog.found() - set_variable(option+'_bin', prog.path()) + if meson.version().version_compare('>=0.55') + set_variable(option+'_bin', prog.full_path()) + else + set_variable(option+'_bin', prog.path()) + endif else set_variable(option+'_bin', '') endif