From 7ae4ddd851cbfe6566082f811a12a73f0741f2f7 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 31 Jan 2024 13:42:51 +0100 Subject: [PATCH] Use global interfaces.h --- DCPlugin.pro | 12 +++++++++--- src/ATBAPP/ATBDeviceControllerPlugin.h | 2 +- src/ATBAPP/DeviceControllerDiag.h | 5 +++-- src/ATBAPP/support/CashUtils.h | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/DCPlugin.pro b/DCPlugin.pro index e97d14f..190ec8d 100644 --- a/DCPlugin.pro +++ b/DCPlugin.pro @@ -30,7 +30,14 @@ contains( CONFIG, PTU5 ) { QMAKE_CXXFLAGS += -std=c++11 linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments } CONFIG += link_pkgconfig + PTU5BASEPATH = /opt/devel/ptu5 ARCH = PTU5 + + INCLUDEPATH += $$PTU5BASEPATH/qt/libs/deviceController/include/ + LIBS += -L$$PTU5BASEPATH/qt/libs/deviceController/library + + LIBS += -lCAslave + LIBS += -lCAmaster } contains( CONFIG, PTU5_YOCTO ) { @@ -38,8 +45,8 @@ contains( CONFIG, PTU5_YOCTO ) { PTU5BASEPATH = /opt/devel/ptu5 ARCH = PTU5 - # add qmqtt lib - #LIBS += -lQt5Qmqtt + LIBS += -lCAslave + LIBS += -lCAmaster } TARGET = ATBDeviceControllerPlugin @@ -69,7 +76,6 @@ DEFINES += QT_DEPRECATED_WARNINGS # ATBAPP interface HEADERS += \ - include/interfaces.h \ src/ATBAPP/ATBAPPplugin.h \ src/ATBAPP/DeviceControllerDiag.h \ src/ATBAPP/DeviceControllerInterface.h \ diff --git a/src/ATBAPP/ATBDeviceControllerPlugin.h b/src/ATBAPP/ATBDeviceControllerPlugin.h index 34c7a70..07d5b3d 100644 --- a/src/ATBAPP/ATBDeviceControllerPlugin.h +++ b/src/ATBAPP/ATBDeviceControllerPlugin.h @@ -12,7 +12,7 @@ #include "support/PersistentData.h" -#include "interfaces.h" +#include #include diff --git a/src/ATBAPP/DeviceControllerDiag.h b/src/ATBAPP/DeviceControllerDiag.h index ca75983..915d886 100644 --- a/src/ATBAPP/DeviceControllerDiag.h +++ b/src/ATBAPP/DeviceControllerDiag.h @@ -5,9 +5,10 @@ #include #include -#include "ATBMachineEvent.h" -#include "interfaces.h" +#include + #include "DeviceControllerInterface.h" +#include "ATBMachineEvent.h" #include "support/PersistentData.h" diff --git a/src/ATBAPP/support/CashUtils.h b/src/ATBAPP/support/CashUtils.h index 1bfc654..f746324 100644 --- a/src/ATBAPP/support/CashUtils.h +++ b/src/ATBAPP/support/CashUtils.h @@ -2,7 +2,7 @@ #define CASHUTILS_H #include -#include "interfaces.h" +#include namespace CashUtils {