From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH i-g-t 2/2] meson: intel_dp_compliance depends on libudev
Date: Tue, 24 Oct 2017 11:14:15 +0300 [thread overview]
Message-ID: <20171024081415.18086-2-jani.nikula@intel.com> (raw)
In-Reply-To: <20171024081415.18086-1-jani.nikula@intel.com>
Only build intel_dp_compliance when libudev is available, also include
libudev in the list of dependencies.
Fixes error when libudev isn't there:
../tools/intel_dp_compliance_hotplug.c:33:21: fatal error: libudev.h: No such file or directory
#include <libudev.h>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
tools/meson.build | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/tools/meson.build b/tools/meson.build
index 1bacac58647a..7fc5390a6f63 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -57,10 +57,15 @@ endforeach
pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools')
-intel_dp_compliance_src = [ 'intel_dp_compliance.c', 'intel_dp_compliance_hotplug.c' ]
-executable('intel_dp_compliance', sources : intel_dp_compliance_src,
- dependencies : tool_deps,
- install : true)
+if libudev.found()
+ intel_dp_compliance_src = [
+ 'intel_dp_compliance.c',
+ 'intel_dp_compliance_hotplug.c'
+ ]
+ executable('intel_dp_compliance', sources : intel_dp_compliance_src,
+ dependencies : [tool_deps, libudev],
+ install : true)
+endif
intel_l3_parity_src = [ 'intel_l3_parity.c', 'intel_l3_udev_listener.c' ]
executable('intel_l3_parity', sources : intel_l3_parity_src,
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-10-24 8:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-24 8:14 [PATCH i-g-t 1/2] meson: don't assume xmlrpc-c-config is there Jani Nikula
2017-10-24 8:14 ` Jani Nikula [this message]
2017-10-24 8:32 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
2017-10-24 9:13 ` ✓ Fi.CI.IGT: " Patchwork
2017-10-24 12:29 ` [PATCH i-g-t 1/2] " Arkadiusz Hiler
2017-10-24 14:54 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] " Patchwork
2017-10-24 15:00 ` Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171024081415.18086-2-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox