diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2016-09-22 10:10:47 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2016-09-23 08:38:31 +0000 |
| commit | 44c400ea9bc2a16bbd0be9fa395dc0644a7024cb (patch) | |
| tree | 60a7ddc69bca41a16403ebf3e929321617f4f0ee /libqdb | |
| parent | 61b436bf1da4371ee528fb3c5ddef3d4936e494f (diff) | |
Use pkg-config for libusb-1.0 in Unix
Rather than hard-coded include path, use pkg-config. Also use it in a
config.test in order to give a clear error message early.
Change-Id: I18da309131e0cc428433efe114c2004c06a15fd0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'libqdb')
| -rw-r--r-- | libqdb/libqdb.pro | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libqdb/libqdb.pro b/libqdb/libqdb.pro index 7140629..eb1e302 100644 --- a/libqdb/libqdb.pro +++ b/libqdb/libqdb.pro @@ -3,6 +3,14 @@ QT -= gui TARGET = qdb TEMPLATE = lib +unix { + CONFIG += link_pkgconfig + PKGCONFIG += libusb-1.0 +} +win32 { + LIBS += -llibusb-1.0 +} + DEFINES += LIBQDB_LIBRARY SOURCES += \ @@ -32,14 +40,8 @@ HEADERS += \ interruptsignalhandler.h \ unix { - LIBS += -lusb-1.0 target.path = /usr/lib INSTALLS += target } -win32 { - LIBS += -llibusb-1.0 -} - INCLUDEPATH += $$PWD -INCLUDEPATH += $$[QT_SYSROOT]/usr/include/libusb-1.0/ |