modbus: build eastron via paquets systeme (pkgconfig nymea-modbus + modbus-tool.pri), nettoyage .pro

This commit is contained in:
Patrick Schurig 2026-05-31 17:43:28 +02:00
parent b1da668036
commit 228a30e585
4 changed files with 491 additions and 15 deletions

23
.qmake.stash Normal file
View File

@ -0,0 +1,23 @@
QMAKE_CXX.QT_COMPILER_STDCXX = 201703L
QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 14
QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 2
QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
QMAKE_CXX.COMPILER_MACROS = \
QT_COMPILER_STDCXX \
QMAKE_GCC_MAJOR_VERSION \
QMAKE_GCC_MINOR_VERSION \
QMAKE_GCC_PATCH_VERSION
QMAKE_CXX.INCDIRS = \
/usr/include/c++/14 \
/usr/include/x86_64-linux-gnu/c++/14 \
/usr/include/c++/14/backward \
/usr/lib/gcc/x86_64-linux-gnu/14/include \
/usr/local/include \
/usr/include/x86_64-linux-gnu \
/usr/include
QMAKE_CXX.LIBDIRS = \
/usr/lib/gcc/x86_64-linux-gnu/14 \
/usr/lib/x86_64-linux-gnu \
/usr/lib \
/lib/x86_64-linux-gnu \
/lib

461
Makefile Normal file

File diff suppressed because one or more lines are too long

View File

@ -5,19 +5,12 @@ TEMPLATE = subdirs
SUBDIRS += nymea-modbus-cli libnymea-modbus libnymea-sunspec
PLUGIN_DIRS = \
eastron-all-models \
waveshare-relay-d8 \
eastron
message(============================================)
message("Qt version:" $$[QT_VERSION])
!greaterThan(QT_MAJOR_VERSION, 5) {
# We disable unipi for
PLUGIN_DIRS += \
unipi
}
gcc {
COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion")
COMPILER_MAJOR_VERSION = $$str_member($$COMPILER_VERSION)

View File

@ -1,12 +1,11 @@
QT += network serialport serialbus
top_srcdir=$$PWD
top_builddir=$$shadowed($$PWD)
INCLUDEPATH += $$top_srcdir/libnymea-modbus
LIBS += -L$$top_builddir/libnymea-modbus/ -lnymea-modbus
# libnymea-modbus depuis le paquet systeme (libnymea-modbus-dev), plus les sources locales
CONFIG += link_pkgconfig
PKGCONFIG += nymea-modbus
OTHER_FILES += $${MODBUS_CONNECTIONS}
include(libnymea-modbus/modbus-tool.pri)
# Outil de generation des connexions modbus (sdm*-registers.json -> .cpp/.h),
# fourni par libnymea-modbus-dev
include(/usr/include/nymea-modbus/modbus-tool.pri)