macos libusb workflow fix

jankae · Nov 3, 2024 · 48cc389 · 48cc389
1 parent 67a186b
commit 48cc389
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>