Skip to content

Commit 48cc389

Browse files
committed
macos libusb workflow fix
1 parent 67a186b commit 48cc389

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/usbdevice.h

+4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33

44
#include "Util/usbinbuffer.h"
55

6+
#ifdef Q_OS_MACOS
7+
#include <libusb.h>
8+
#else
69
#include <libusb-1.0/libusb.h>
10+
#endif
711
#include <QString>
812
#include <set>
913
#include <functional>

Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/librevnausbdriver.h

+4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
#include "librevnadriver.h"
55
#include "Util/usbinbuffer.h"
66

7+
#ifdef Q_OS_MACOS
8+
#include <libusb.h>
9+
#else
710
#include <libusb-1.0/libusb.h>
11+
#endif
812
#include <thread>
913

1014
#include <QQueue>

Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro

+6
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,12 @@ win32:LIBS += -L"$$_PRO_FILE_PWD_" # Github actions placed libusb here
315315
osx:INCPATH += /usr/local/include
316316
osx:LIBS += -L/usr/local/lib $(shell pkg-config --libs libusb-1.0)
317317

318+
mac{
319+
QT_CONFIG -= no-pkg-config
320+
CONFIG += link_pkgconfig
321+
PKGCONFIG += libusb-1.0
322+
}
323+
318324
QT += widgets network
319325

320326
FORMS += \

Software/PC_Application/LibreVNA-GUI/Util/usbinbuffer.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#ifndef USBINBUFFER_H
22
#define USBINBUFFER_H
33

4+
#ifdef Q_OS_MACOS
5+
#include <libusb.h>
6+
#else
47
#include <libusb-1.0/libusb.h>
8+
#endif
59
#include <condition_variable>
610

711
#include <QObject>

0 commit comments

Comments
 (0)