[i-g-t,1/2] tests/testdisplay: Explicitly use GLIB_CFLAGS

Commit Message

Thierry Reding Feb. 5, 2018, 11:56 a.m. UTC

From: Thierry Reding <[e-mail]>

testdisplay.h includes the glib.h header file but the Makefile does not
explicitly pass a -I option with the path containing that header, hence
causing the build to fail. Note that this doesn't seem to happen with a
recent enough version of cairo, which implicitly provides the correct
-I option.

Signed-off-by: Thierry Reding <[e-mail]>
---
 tests/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

Comments

Arkadiusz Hiler Feb. 27, 2018, 1:50 p.m. UTC | #1

On Tue, Feb 27, 2018 at 03:38:58PM +0200, Petri Latvala wrote:
> On Mon, Feb 05, 2018 at 12:56:10PM +0100, Thierry Reding wrote:
> > From: Thierry Reding <[e-mail]>
> > 
> > testdisplay.h includes the glib.h header file but the Makefile does not
> > explicitly pass a -I option with the path containing that header, hence
> > causing the build to fail. Note that this doesn't seem to happen with a
> > recent enough version of cairo, which implicitly provides the correct
> > -I option.
> 
> 
> Hmm. We only have GLIB_CFLAGS when HAVE_GLIB, but testdisplay is
> always built. Same for intel_dp_compliance.
> 
> Should we make glib mandatory as well? Arek, thoughts?

Yep, making sounds good. It's extremely common and we use it also for
the igtrc handling.

This allows us to remove quite a few more ifdefs and will make couple of
pending reworks easier :-)

- Arek

Patch

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1b9a7b0a2311..8472a6bf0a73 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -149,6 +149,8 @@  kms_chamelium_LDADD = $(LDADD) $(XMLRPC_LIBS) $(LIBUDEV_LIBS)
 audio_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
 audio_LDADD = $(LDADD) $(ALSA_LIBS)
 
+testdisplay_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
+
 amdgpu_amd_basic_CFLAGS = $(AM_CFLAGS) $(DRM_AMDGPU_CFLAGS)
 amdgpu_amd_basic_LDADD = $(LDADD) $(DRM_AMDGPU_LIBS)
 amdgpu_amd_cs_nop_CFLAGS = $(AM_CFLAGS) $(DRM_AMDGPU_CFLAGS)