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:
parent
24bc67c914
commit
7edbdb2499
|
@ -10,7 +10,7 @@ foreach cd: src
|
||||||
custom_target(' '.join(['config_dist', dir, cd]),
|
custom_target(' '.join(['config_dist', dir, cd]),
|
||||||
input : cd + '.src',
|
input : cd + '.src',
|
||||||
output : cd + '.cfg',
|
output : cd + '.cfg',
|
||||||
command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
|
command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
|
||||||
install : true,
|
install : true,
|
||||||
install_dir: join_paths(dir_config, dir)
|
install_dir: join_paths(dir_config, dir)
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
dir_config = join_paths(dir_data, 'enlightenment/data/config')
|
dir_config = join_paths(dir_data, 'enlightenment/data/config')
|
||||||
|
|
||||||
eet = find_program('eet')
|
eet_cmd = get_option('eet')
|
||||||
gen_eet = generator(eet,
|
if eet_cmd == ''
|
||||||
output : '@BASENAME@.cfg',
|
eet_cmd = join_paths(dep_eet.get_pkgconfig_variable('prefix'),
|
||||||
arguments: ['-e', '@OUTPUT@', 'config', '@INPUT@', '1'])
|
'bin', 'eet')
|
||||||
|
endif
|
||||||
|
|
||||||
custom_target('profile.src',
|
custom_target('profile.src',
|
||||||
input : 'profile.src',
|
input : 'profile.src',
|
||||||
command : [eet, '-i', '@OUTPUT@', 'config', '@INPUT@', '1'],
|
command : [eet_cmd, '-i', '@OUTPUT@', 'config', '@INPUT@', '1'],
|
||||||
output : ['profile.cfg'],
|
output : ['profile.cfg'],
|
||||||
install : true,
|
install : true,
|
||||||
install_dir: dir_config
|
install_dir: dir_config
|
||||||
|
|
|
@ -12,7 +12,7 @@ foreach cd: src
|
||||||
custom_target(' '.join(['config_dist', dir, cd]),
|
custom_target(' '.join(['config_dist', dir, cd]),
|
||||||
input : cd + '.src',
|
input : cd + '.src',
|
||||||
output : cd + '.cfg',
|
output : cd + '.cfg',
|
||||||
command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
|
command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
|
||||||
install : true,
|
install : true,
|
||||||
install_dir: join_paths(dir_config, dir)
|
install_dir: join_paths(dir_config, dir)
|
||||||
)
|
)
|
||||||
|
|
|
@ -18,7 +18,7 @@ foreach cd: src
|
||||||
custom_target(' '.join(['config_dist', dir, cd]),
|
custom_target(' '.join(['config_dist', dir, cd]),
|
||||||
input : cd + '.src',
|
input : cd + '.src',
|
||||||
output : cd + '.cfg',
|
output : cd + '.cfg',
|
||||||
command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
|
command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
|
||||||
install : true,
|
install : true,
|
||||||
install_dir: join_paths(dir_config, dir)
|
install_dir: join_paths(dir_config, dir)
|
||||||
)
|
)
|
||||||
|
|
|
@ -19,7 +19,7 @@ foreach cd: src
|
||||||
custom_target(' '.join(['config_dist', dir, cd]),
|
custom_target(' '.join(['config_dist', dir, cd]),
|
||||||
input : cd + '.src',
|
input : cd + '.src',
|
||||||
output : cd + '.cfg',
|
output : cd + '.cfg',
|
||||||
command : [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
|
command : [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
|
||||||
install : true,
|
install : true,
|
||||||
install_dir: join_paths(dir_config, dir)
|
install_dir: join_paths(dir_config, dir)
|
||||||
)
|
)
|
||||||
|
|
|
@ -23,6 +23,10 @@ option('eldbus-codegen',
|
||||||
type : 'string',
|
type : 'string',
|
||||||
description: 'A path to a eldbus-codegen. Defaults to system eldbus-codegen')
|
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',
|
option('pam',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
value: true,
|
value: true,
|
||||||
|
|
Loading…
Reference in New Issue