From 226231afaf6d1eb42c88442543dce7874f6939c0 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Wed, 19 Jul 2017 21:50:33 +1000 Subject: Use pkg-config for libdrm in eglfs_kms_egldevice backend if possible Without pkg-config, /usr/include/libdrm is not added to the include search path so xf86drm.h may be unable to include drm.h. This change is being applied directly to 5.6 because it's not applicable to 5.9 or dev. Those versions of Qt have moved to using QMAKE_USE which will already use pkg-config if available. Change-Id: I875c1e5f1b3cce63fd6b529d9d8ac97fd5bb56e8 Reviewed-by: Oswald Buddenhagen --- .../deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro index 1932f861b9..f7015d3cb5 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro @@ -16,7 +16,12 @@ HEADERS += $$PWD/qeglfskmsegldeviceintegration.h OTHER_FILES += $$PWD/eglfs_kms_egldevice.json -LIBS += -ldrm +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += libdrm +} else { + LIBS += -ldrm +} PLUGIN_TYPE = egldeviceintegrations PLUGIN_CLASS_NAME = QEglFSKmsEglDeviceIntegrationPlugin -- cgit v1.2.3