enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

meson: make it possible to set the path for eet 

Follow the approach of edje_cc and eldbus-codegen which detecting the
eet binary.
This commit is contained in:
Stefan Schmidt 2017-11-23 16:12:12 +01:00
parent ff9831e2e4
commit c1afa0a05b
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/default/meson.build
View File

@ -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)
)

11
config/meson.build
View File

@ -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

2
config/mobile/meson.build
View File

@ -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)
)

2
config/standard/meson.build
View File

@ -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)
)

2
config/tiling/meson.build
View File

@ -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)
)

4
meson_options.txt
View File

@ -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,