stefan pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=c1afa0a05bf095bf6f9bebab4968202b20f308e8
commit c1afa0a05bf095bf6f9bebab4968202b20f308e8
Author: Stefan Schmidt <ste...@osg.samsung.com>
Date: Thu Nov 23 16:12:12 2017 +0100
meson: make it possible to set the path for eet
Follow the approach of edje_cc and eldbus-codegen which detecting the
eet binary.
---
config/default/meson.build | 2 +-
config/meson.build | 11 ++++++-----
config/mobile/meson.build | 2 +-
config/standard/meson.build | 2 +-
config/tiling/meson.build | 2 +-
meson_options.txt | 4 ++++
6 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/config/default/meson.build b/config/default/meson.build
index 8f85344d9..f993a4393 100644
--- a/config/default/meson.build
+++ b/config/default/meson.build
@@ -10,7 +10,7 @@ foreach cd: src
custom_target(' '.join(['config_dist', dir, cd]),
input : cd + '.src',
output : cd + '.cfg',
- command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
+ command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@',
'1'],
install : true,
install_dir: join_paths(dir_config, dir)
)
diff --git a/config/meson.build b/config/meson.build
index 221b21997..3cc83881a 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -1,13 +1,14 @@
dir_config = join_paths(dir_data, 'enlightenment/data/config')
-eet = find_program('eet')
-gen_eet = generator(eet,
- output : '@BASENAME@.cfg',
- arguments: ['-e', '@OUTPUT@', 'config', '@INPUT@', '1'])
+eet_cmd = get_option('eet')
+if eet_cmd == ''
+ eet_cmd = join_paths(dep_eet.get_pkgconfig_variable('prefix'),
+ 'bin', 'eet')
+endif
custom_target('profile.src',
input : 'profile.src',
- command : [eet, '-i', '@OUTPUT@', 'config', '@INPUT@', '1'],
+ command : [eet_cmd, '-i', '@OUTPUT@', 'config', '@INPUT@',
'1'],
output : ['profile.cfg'],
install : true,
install_dir: dir_config
diff --git a/config/mobile/meson.build b/config/mobile/meson.build
index 655bfb357..64be2ad4e 100644
--- a/config/mobile/meson.build
+++ b/config/mobile/meson.build
@@ -12,7 +12,7 @@ foreach cd: src
custom_target(' '.join(['config_dist', dir, cd]),
input : cd + '.src',
output : cd + '.cfg',
- command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
+ command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@',
'1'],
install : true,
install_dir: join_paths(dir_config, dir)
)
diff --git a/config/standard/meson.build b/config/standard/meson.build
index bb430da27..dfaacd8cd 100644
--- a/config/standard/meson.build
+++ b/config/standard/meson.build
@@ -18,7 +18,7 @@ foreach cd: src
custom_target(' '.join(['config_dist', dir, cd]),
input : cd + '.src',
output : cd + '.cfg',
- command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
+ command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@',
'1'],
install : true,
install_dir: join_paths(dir_config, dir)
)
diff --git a/config/tiling/meson.build b/config/tiling/meson.build
index 806396579..50f074ccb 100644
--- a/config/tiling/meson.build
+++ b/config/tiling/meson.build
@@ -19,7 +19,7 @@ foreach cd: src
custom_target(' '.join(['config_dist', dir, cd]),
input : cd + '.src',
output : cd + '.cfg',
- command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
+ command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@',
'1'],
install : true,
install_dir: join_paths(dir_config, dir)
)
diff --git a/meson_options.txt b/meson_options.txt
index cfa140e0f..234802766 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -23,6 +23,10 @@ option('eldbus-codegen',
type : 'string',
description: 'A path to a eldbus-codegen. Defaults to system
eldbus-codegen')
+option('eet',
+ type : 'string',
+ description: 'A path to a eet. Defaults to system eet')
+
option('pam',
type: 'boolean',
value: true,
--
