meson: add cxx bindings

this commit adds cxx bindings to meson.

Differential Revision: https://phab.enlightenment.org/D7169

6 files changed, 20 insertions, 6 deletions

diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 8d29c404a8..078e43f8c6 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -107,6 +107,8 @@ foreach eo_file : pub_eo_files
                            '-gch', '@INPUT@'])
 endforeach
 
+pub_eo_files += pub_legacy_eo_files
+
 pub_eo_types_files = [
   'efl_gfx_types.eot',
   'efl_ui_types.eot',
@@ -126,7 +128,13 @@ foreach eo_file : pub_eo_types_files
                            '-gh', '@INPUT@'])
 endforeach
 
-pub_eo_files = files(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files)
+install_data(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files,
+  install_dir: join_paths(eolian_include_dir, package_version_name)
+)
+
+efl_interfaces_eo_files = pub_eo_files
+
+pub_eo_files = []
 
 efl_src += files([
   'efl_interfaces_main.c',
diff --git a/src/lib/efl/meson.build b/src/lib/efl/meson.build
index 75acef3b54..6677cf2327 100644
--- a/src/lib/efl/meson.build
+++ b/src/lib/efl/meson.build
@@ -24,10 +24,8 @@ efl = declare_dependency(
   sources : pub_eo_file_target
 )
 
-install_data(pub_eo_files,
-  install_dir: join_paths(eolian_include_dir, package_version_name)
-)
-
 install_headers(efl_header_src,
   install_dir : dir_package_include,
 )
+
+efl_eo_subdirs = ['interfaces']
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index 47db33de4b..e6298f70cd 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -77,6 +77,8 @@ pub_eo_files = [
   'efl_canvas_text.eo'
 ]
 
+evas_canvas_eo_files = pub_eo_files
+
 pub_evas_eo_files += files(pub_eo_files)
 
 foreach eo_file : pub_eo_files
diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build
index 62d9b27599..cd755f51c3 100644
--- a/src/lib/evas/gesture/meson.build
+++ b/src/lib/evas/gesture/meson.build
@@ -7,6 +7,8 @@ pub_eo_files = [
   'efl_canvas_gesture_manager.eo'
 ]
 
+evas_gesture_eo_files = pub_eo_files
+
 foreach eo_file : pub_eo_files
   pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
     input : eo_file,
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index d72032d957..8175c87565 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -173,3 +173,5 @@ install_headers(evas_header_src,
 )
 
 automatic_pkgfile = false
+pub_eo_files = []
+evas_eo_subdirs = ['canvas', 'gesture']
diff --git a/src/lib/evas_goal/meson.build b/src/lib/evas_goal/meson.build
index 057006884c..28db42f00b 100644
--- a/src/lib/evas_goal/meson.build
+++ b/src/lib/evas_goal/meson.build
@@ -7,9 +7,11 @@ evas_lib = library('evas',
     version : meson.project_version()
 )
 
+evas_pub_deps = [eina, ecore, ector, emile, evas_pre]
+
 evas = declare_dependency(
    link_with : [evas_lib],
-   dependencies : [eina, ecore, ector, emile, evas_pre],
+   dependencies : evas_pub_deps,
    include_directories : evas_include_directories
 )