From 48cc3891cd465ba60c2dace66db944df1a747e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <j.kaeberich@gmx.de>
Date: Sun, 3 Nov 2024 13:43:00 +0100
Subject: [PATCH] macos libusb workflow fix

---
 .../LibreVNA-GUI/Calibration/LibreCAL/usbdevice.h           | 4 ++++
 .../LibreVNA-GUI/Device/LibreVNA/librevnausbdriver.h        | 4 ++++
 Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro       | 6 ++++++
 Software/PC_Application/LibreVNA-GUI/Util/usbinbuffer.h     | 4 ++++
 4 files changed, 18 insertions(+)

diff --git a/Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/usbdevice.h b/Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/usbdevice.h
index c351c737..e1c78cf2 100644
--- a/Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/usbdevice.h
+++ b/Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/usbdevice.h
@@ -3,7 +3,11 @@
 
 #include "Util/usbinbuffer.h"
 
+#ifdef Q_OS_MACOS
+#include <libusb.h>
+#else
 #include <libusb-1.0/libusb.h>
+#endif
 #include <QString>
 #include <set>
 #include <functional>
diff --git a/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/librevnausbdriver.h b/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/librevnausbdriver.h
index 39a99e02..8a7614d9 100644
--- a/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/librevnausbdriver.h
+++ b/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/librevnausbdriver.h
@@ -4,7 +4,11 @@
 #include "librevnadriver.h"
 #include "Util/usbinbuffer.h"
 
+#ifdef Q_OS_MACOS
+#include <libusb.h>
+#else
 #include <libusb-1.0/libusb.h>
+#endif
 #include <thread>
 
 #include <QQueue>
diff --git a/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro b/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
index 7e58790a..f5b0f8b4 100644
--- a/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
+++ b/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
@@ -315,6 +315,12 @@ win32:LIBS += -L"$$_PRO_FILE_PWD_" # Github actions placed libusb here
 osx:INCPATH += /usr/local/include
 osx:LIBS += -L/usr/local/lib $(shell pkg-config --libs libusb-1.0)
 
+mac{
+        QT_CONFIG -= no-pkg-config
+        CONFIG += link_pkgconfig
+        PKGCONFIG += libusb-1.0
+}
+
 QT += widgets network
 
 FORMS += \
diff --git a/Software/PC_Application/LibreVNA-GUI/Util/usbinbuffer.h b/Software/PC_Application/LibreVNA-GUI/Util/usbinbuffer.h
index 21b4ef0c..5f1f5c39 100644
--- a/Software/PC_Application/LibreVNA-GUI/Util/usbinbuffer.h
+++ b/Software/PC_Application/LibreVNA-GUI/Util/usbinbuffer.h
@@ -1,7 +1,11 @@
 #ifndef USBINBUFFER_H
 #define USBINBUFFER_H
 
+#ifdef Q_OS_MACOS
+#include <libusb.h>
+#else
 #include <libusb-1.0/libusb.h>
+#endif
 #include <condition_variable>
 
 #include <QObject>