diff options
| author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-05-20 08:48:29 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-05-20 08:49:40 -0400 |
| commit | ee7a6c9a40778768241a564bca22d283517c5c02 (patch) | |
| tree | 6aac2c52ca97f29725175a545644e7cfb7a0fe20 | |
| parent | 24e4881efbaef7b4d8a94b2e79ce99e259381213 (diff) | |
| download | efl-ee7a6c9a40778768241a564bca22d283517c5c02.tar.gz | |
meson: fix installed .eo files and fix cross compile
Summary:
if things are a array in a array, then flattening only seems to work
when the first element is a target object. But not when the first
element is then also an string, then the string in the array gets
concatted and added to root array. This is a meson bug, investigation
going on. Additionally, this fixes installed .eo files, as we might want
to installed gesture files when we require them in other objects.
Reviewers: Jaehyun_Cho, zmike
Reviewed By: zmike
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D8910
| -rw-r--r-- | src/lib/evas/gesture/meson.build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build index 04cb753fcd..9854e6f94d 100644 --- a/src/lib/evas/gesture/meson.build +++ b/src/lib/evas/gesture/meson.build @@ -21,6 +21,7 @@ pub_eo_files = [ ] evas_gesture_eo_files = pub_eo_files +pub_evas_eo_files += files(pub_eo_files) foreach eo_file : pub_eo_files pub_eo_file_target += custom_target('eolian_gen_' + eo_file, @@ -29,7 +30,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : join_paths(dir_package_include, 'gesture'), - command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + ['-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |