summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2020-06-06 19:09:21 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2020-06-06 19:28:26 +0200
commitc3a1060b94ae9df82e8406b481e8bd5fe5741df5 (patch)
treeecdbdd44fa4e58e9f415549dcf77873787e54c58 /src
parent628268a102dde3b94b74f1652c6a5e56c2810cb6 (diff)
build: disable elua by default, plus nicer detection
Elua is now disabled by default. There are some other changes: 1) Elua scripts are only installed if Elua is enabled 2) Lua bindings are only installed if Elua is enabled 3) Elua with interpreter is clearly experimental and will message
Diffstat (limited to 'src')
-rw-r--r--src/bindings/meson.build4
-rw-r--r--src/lib/elua/meson.build5
-rw-r--r--src/scripts/meson.build5
3 files changed, 9 insertions, 5 deletions
diff --git a/src/bindings/meson.build b/src/bindings/meson.build
index 61027d3743..d7d7cba8be 100644
--- a/src/bindings/meson.build
+++ b/src/bindings/meson.build
@@ -18,6 +18,10 @@ if (bindings.contains('cxx') == false and bindings.contains('mono'))
18 ) 18 )
19endif 19endif
20 20
21if bindings.contains('lua') and not have_elua
22 error('Elua is necessary for Lua bindings')
23endif
24
21foreach binding : bindings_order 25foreach binding : bindings_order
22 if bindings.contains(binding) 26 if bindings.contains(binding)
23 subdir(join_paths( binding)) 27 subdir(join_paths( binding))
diff --git a/src/lib/elua/meson.build b/src/lib/elua/meson.build
index 15b66aefdb..66bd9454b9 100644
--- a/src/lib/elua/meson.build
+++ b/src/lib/elua/meson.build
@@ -2,10 +2,7 @@ elua_deps = [eina, eo, efl, ecore, ecore_file, intl]
2elua_pub_deps = [lua] 2elua_pub_deps = [lua]
3 3
4if get_option('lua-interpreter') == 'lua' 4if get_option('lua-interpreter') == 'lua'
5 luaver_min = cc.compute_int('LUA_VERSION_NUM - 500', 5 elua_deps += lua_ffi
6 prefix: '#include <lua.h>', dependencies: lua
7 )
8 elua_deps += dependency('cffi-lua-5.@0@'.format(luaver_min))
9endif 6endif
10 7
11elua_src = ['elua.c', 'io.c', 'cache.c'] 8elua_src = ['elua.c', 'io.c', 'cache.c']
diff --git a/src/scripts/meson.build b/src/scripts/meson.build
index 6057ad788a..48713158b0 100644
--- a/src/scripts/meson.build
+++ b/src/scripts/meson.build
@@ -1,2 +1,5 @@
1subdir('eo') 1subdir('eo')
2subdir('elua') 2
3if have_elua
4 subdir('elua')
5endif