meson: make it possible to set the path for eldbus-codegen

find_program() did not detect the eldbus-codegen binary in a given
prefix. Which is a situation we have on Jenkins builds. Make it an
option that can be set like we already do with edje_cc.
If there is a more meson-like approach to this I do not know feel free
to enlight me.
devs/bu5hm4n/sandbox_fix
Stefan Schmidt 5 years ago
parent 76e1e8be11
commit ff9831e2e4
  1. 6
      meson.build
  2. 4
      meson_options.txt
  3. 2
      src/modules/geolocation/meson.build
  4. 2
      src/modules/music-control/meson.build

@ -320,7 +320,11 @@ if dep_xkeyboard_config.found() == true
config_h.set_quoted('XKB_BASE', dep_xkeyboard_config.get_pkgconfig_variable('xkb_base'))
endif
eldbus_codegen = find_program('eldbus-codegen')
eldbus_codegen_cmd = get_option('eldbus-codegen')
if eldbus_codegen_cmd == ''
eldbus_codegen_cmd = join_paths(dep_eldbus.get_pkgconfig_variable('prefix'),
'bin', 'eldbus-codegen')
endif
requires_e = []

@ -19,6 +19,10 @@ option('edje-cc',
type : 'string',
description: 'A path to a edje_cc. Defaults to system edje_cc')
option('eldbus-codegen',
type : 'string',
description: 'A path to a eldbus-codegen. Defaults to system eldbus-codegen')
option('pam',
type: 'boolean',
value: true,

@ -14,6 +14,6 @@ src = files(
src += custom_target('geolocation_gen',
input : 'org.freedesktop.GeoClue2.xml',
command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'],
command: [eldbus_codegen_cmd, '@INPUT@', '-O', '@OUTDIR@'],
output : created_file
)

@ -15,6 +15,6 @@ src = files(
src += custom_target('gen-dbus',
input : 'introspect.xml',
command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'],
command: [eldbus_codegen_cmd, '@INPUT@', '-O', '@OUTDIR@'],
output : created_file
)

Loading…
Cancel
Save