lauromoura pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=cc4aa8ccaa055ef81714c8e63bdee582c4c94284

commit cc4aa8ccaa055ef81714c8e63bdee582c4c94284
Author: Marcel Hollerbach <m...@marcel-hollerbach.de>
Date:   Tue Oct 1 09:57:04 2019 -0300

    meson: support mono bindings building without cxx
    
    Summary:
    the mono bindings do depend partitially on the cxx bindings, eina_cxx
    and eolian_cxx are needed, nothing more. With this commit you can build
    mono without cxx.
    
    fixes T8292
    
    Reviewers: lauromoura
    
    Reviewed By: lauromoura
    
    Subscribers: cedric, #reviewers, #committers
    
    Tags: #efl
    
    Maniphest Tasks: T8292
    
    Differential Revision: https://phab.enlightenment.org/D10264
---
 meson.build              | 11 +----------
 src/bindings/meson.build | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/meson.build b/meson.build
index f7afdfb11a..55270cda23 100644
--- a/meson.build
+++ b/meson.build
@@ -440,16 +440,7 @@ if sys_windows == false
   subdir(join_paths('src', 'generic', 'emotion'))
 endif
 subdir('cmakeconfig')
-
-bindings = get_option('bindings')
-bindings_order = ['luajit', 'cxx', 'mono']
-
-foreach binding : bindings_order
-  if bindings.contains(binding)
-    subdir(join_paths('src', 'bindings', binding))
-  endif
-endforeach
-
+subdir(join_paths('src', 'bindings'))
 subdir(join_paths('src', 'edje_external'))
 subdir(join_paths('data'))
 
diff --git a/src/bindings/meson.build b/src/bindings/meson.build
new file mode 100644
index 0000000000..e6a59d1559
--- /dev/null
+++ b/src/bindings/meson.build
@@ -0,0 +1,20 @@
+
+bindings = get_option('bindings')
+bindings_order = ['luajit', 'cxx', 'mono']
+
+if (bindings.contains('cxx') == false and bindings.contains('mono'))
+  subdirs = ['eina_cxx', 'eolian_cxx']
+  subdir(join_paths('cxx', 'eina_cxx'))
+  inc_dir = []
+  subdir(join_paths('cxx', 'eolian_cxx'))
+  eolian_cxx = declare_dependency(
+    include_directories: inc_dir,
+    dependencies : eolian
+  )
+endif
+
+foreach binding : bindings_order
+  if bindings.contains(binding)
+    subdir(join_paths( binding))
+  endif
+endforeach

-- 


Reply via email to