summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-08-18 17:05:27 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-10-18 16:01:07 +0200
commit5aaf2cbb5defd64a2048fe90e80004d435bbca1a (patch)
tree40085c97f5b1493c00cb1898dbb0607f803bcaf9 /src/lib
parent16c4eba56553a49d30dcfd6073078694f6b81511 (diff)
meson: add cxx bindings
this commit adds cxx bindings to meson. Differential Revision: https://phab.enlightenment.org/D7169
Diffstat (limited to '')
-rw-r--r--src/lib/efl/interfaces/meson.build10
-rw-r--r--src/lib/efl/meson.build6
-rw-r--r--src/lib/evas/canvas/meson.build2
-rw-r--r--src/lib/evas/gesture/meson.build2
-rw-r--r--src/lib/evas/meson.build2
-rw-r--r--src/lib/evas_goal/meson.build4
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
107 '-gch', '@INPUT@']) 107 '-gch', '@INPUT@'])
108endforeach 108endforeach
109 109
110pub_eo_files += pub_legacy_eo_files
111
110pub_eo_types_files = [ 112pub_eo_types_files = [
111 'efl_gfx_types.eot', 113 'efl_gfx_types.eot',
112 'efl_ui_types.eot', 114 'efl_ui_types.eot',
@@ -126,7 +128,13 @@ foreach eo_file : pub_eo_types_files
126 '-gh', '@INPUT@']) 128 '-gh', '@INPUT@'])
127endforeach 129endforeach
128 130
129pub_eo_files = files(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files) 131install_data(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files,
132 install_dir: join_paths(eolian_include_dir, package_version_name)
133)
134
135efl_interfaces_eo_files = pub_eo_files
136
137pub_eo_files = []
130 138
131efl_src += files([ 139efl_src += files([
132 'efl_interfaces_main.c', 140 '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(
24 sources : pub_eo_file_target 24 sources : pub_eo_file_target
25) 25)
26 26
27install_data(pub_eo_files,
28 install_dir: join_paths(eolian_include_dir, package_version_name)
29)
30
31install_headers(efl_header_src, 27install_headers(efl_header_src,
32 install_dir : dir_package_include, 28 install_dir : dir_package_include,
33) 29)
30
31efl_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 = [
77 'efl_canvas_text.eo' 77 'efl_canvas_text.eo'
78] 78]
79 79
80evas_canvas_eo_files = pub_eo_files
81
80pub_evas_eo_files += files(pub_eo_files) 82pub_evas_eo_files += files(pub_eo_files)
81 83
82foreach eo_file : pub_eo_files 84foreach 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 = [
7 'efl_canvas_gesture_manager.eo' 7 'efl_canvas_gesture_manager.eo'
8] 8]
9 9
10evas_gesture_eo_files = pub_eo_files
11
10foreach eo_file : pub_eo_files 12foreach eo_file : pub_eo_files
11 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 13 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
12 input : eo_file, 14 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,
173) 173)
174 174
175automatic_pkgfile = false 175automatic_pkgfile = false
176pub_eo_files = []
177evas_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',
7 version : meson.project_version() 7 version : meson.project_version()
8) 8)
9 9
10evas_pub_deps = [eina, ecore, ector, emile, evas_pre]
11
10evas = declare_dependency( 12evas = declare_dependency(
11 link_with : [evas_lib], 13 link_with : [evas_lib],
12 dependencies : [eina, ecore, ector, emile, evas_pre], 14 dependencies : evas_pub_deps,
13 include_directories : evas_include_directories 15 include_directories : evas_include_directories
14) 16)
15 17