From 24bc67c914dfe822dcd0e0dfcd850dd0cd784995 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Thu, 23 Nov 2017 16:00:28 +0100 Subject: [PATCH] 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. --- meson.build | 6 +++++- meson_options.txt | 4 ++++ src/modules/geolocation/meson.build | 2 +- src/modules/music-control/meson.build | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index dde40a8ba..76269fe0a 100644 --- a/meson.build +++ b/meson.build @@ -318,7 +318,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 = [] diff --git a/meson_options.txt b/meson_options.txt index 8f7707443..cfa140e0f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -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, diff --git a/src/modules/geolocation/meson.build b/src/modules/geolocation/meson.build index 5f6c19021..227447e93 100644 --- a/src/modules/geolocation/meson.build +++ b/src/modules/geolocation/meson.build @@ -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 ) diff --git a/src/modules/music-control/meson.build b/src/modules/music-control/meson.build index a84f5ea8e..a96defe7d 100644 --- a/src/modules/music-control/meson.build +++ b/src/modules/music-control/meson.build @@ -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 )