From 88d8e3d215e2a67a3e861263187900853846a00a Mon Sep 17 00:00:00 2001 From: James Duley Date: Fri, 13 Feb 2015 21:39:39 +1300 Subject: [PATCH 1/3] OP-1722 libusb include incorrect: removed rogue inlcude --- ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h index 30366338a..7828773cd 100644 --- a/ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h +++ b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h @@ -33,9 +33,6 @@ #include #include #include -#if defined(Q_OS_LINUX) -#include -#endif #include "../hidapi/hidapi.h" #include "ophid_const.h" #include "ophid_global.h" From fb59e5aef410c6d92a6f08cba00533ad991a131f Mon Sep 17 00:00:00 2001 From: James Duley Date: Fri, 13 Feb 2015 21:48:31 +1300 Subject: [PATCH 2/3] OP-1722 libusb include incorrect: tidy ophid.pro --- .../openpilotgcs/src/plugins/ophid/ophid.pro | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/ophid/ophid.pro b/ground/openpilotgcs/src/plugins/ophid/ophid.pro index bad70ea7a..5955178d9 100644 --- a/ground/openpilotgcs/src/plugins/ophid/ophid.pro +++ b/ground/openpilotgcs/src/plugins/ophid/ophid.pro @@ -38,7 +38,7 @@ macx { -framework IOKit } -linux-g++ { +linux { SOURCES += src/ophid_usbmon_linux.cpp LIBS += -lusb -ludev @@ -52,24 +52,6 @@ linux-g++ { # INCLUDEPATH += `pkg-config libusb-1.0 --cflags` !exists(/usr/include/libusb-1.0) { - error(Install libusb-1.0.0-dev using your package manager.) + error(Install libusb-1.0-0-dev using your package manager.) } } - -linux-g++-64 { - SOURCES += src/ophid_usbmon_linux.cpp - LIBS += -lusb -ludev - - # hidapi library - ## rawhid - # SOURCES += hidapi/linux/hid.c - ## libusb - SOURCES += hidapi/libusb/hid.c - LIBS += `pkg-config libusb-1.0 --libs` -lrt -lpthread - INCLUDEPATH += /usr/include/libusb-1.0 -# INCLUDEPATH += `pkg-config libusb-1.0 --cflags` - !exists(/usr/include/libusb-1.0) { - error(Install libusb-1.0.0-dev using your package manager.) - } -} - From 4cc4ef1537850c7362c01d90f08e24448107e4f7 Mon Sep 17 00:00:00 2001 From: James Duley Date: Fri, 13 Feb 2015 21:48:31 +1300 Subject: [PATCH 3/3] OP-1722 libusb include incorrect: make ophid.pro use pkg-config correctly --- ground/openpilotgcs/src/plugins/ophid/ophid.pro | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/ophid/ophid.pro b/ground/openpilotgcs/src/plugins/ophid/ophid.pro index 5955178d9..f882d9198 100644 --- a/ground/openpilotgcs/src/plugins/ophid/ophid.pro +++ b/ground/openpilotgcs/src/plugins/ophid/ophid.pro @@ -40,16 +40,16 @@ macx { linux { SOURCES += src/ophid_usbmon_linux.cpp - LIBS += -lusb -ludev + LIBS += -ludev -lrt -lpthread # hidapi library ## rawhid # SOURCES += hidapi/linux/hid.c ## libusb SOURCES += hidapi/libusb/hid.c - LIBS += `pkg-config libusb-1.0 --libs` -lrt -lpthread - INCLUDEPATH += /usr/include/libusb-1.0 -# INCLUDEPATH += `pkg-config libusb-1.0 --cflags` + + CONFIG += link_pkgconfig + PKGCONFIG += libusb-1.0 !exists(/usr/include/libusb-1.0) { error(Install libusb-1.0-0-dev using your package manager.)