diff --git a/PhaseCompAcq/PhaseCompAcq.pro b/PhaseCompAcq/PhaseCompAcq.pro index 7da4dd1..5eef2d1 100644 --- a/PhaseCompAcq/PhaseCompAcq.pro +++ b/PhaseCompAcq/PhaseCompAcq.pro @@ -29,10 +29,9 @@ !isEmpty(target.path): INSTALLS += target -win32: LIBS += -L$$PWD/librdkafka/ -lrdkafka -lrdkafka++ +INCLUDEPATH += $$PWD/include/librdkafka +DEPENDPATH += $$PWD/include/librdkafka -INCLUDEPATH += $$PWD/librdkafka/include -DEPENDPATH += $$PWD/librdkafka/include +DISTFILES += conf/config.ini -DISTFILES += \ - conf/config.ini +unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ diff --git a/PhaseCompAcq/PhaseCompAcq.pro b/PhaseCompAcq/PhaseCompAcq.pro index 7da4dd1..5eef2d1 100644 --- a/PhaseCompAcq/PhaseCompAcq.pro +++ b/PhaseCompAcq/PhaseCompAcq.pro @@ -29,10 +29,9 @@ !isEmpty(target.path): INSTALLS += target -win32: LIBS += -L$$PWD/librdkafka/ -lrdkafka -lrdkafka++ +INCLUDEPATH += $$PWD/include/librdkafka +DEPENDPATH += $$PWD/include/librdkafka -INCLUDEPATH += $$PWD/librdkafka/include -DEPENDPATH += $$PWD/librdkafka/include +DISTFILES += conf/config.ini -DISTFILES += \ - conf/config.ini +unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ diff --git a/PhaseCompAcq/common/utils/QKafkaUtil.h b/PhaseCompAcq/common/utils/QKafkaUtil.h index 106b289..f0a0427 100644 --- a/PhaseCompAcq/common/utils/QKafkaUtil.h +++ b/PhaseCompAcq/common/utils/QKafkaUtil.h @@ -3,8 +3,7 @@ #include -#include "librdkafka/include/rdkafkacpp.h" -#include "librdkafka/include/wingetopt.c" +#include "librdkafka/rdkafka.h" class QKafkaUtil : public QObject { diff --git a/PhaseCompAcq/PhaseCompAcq.pro b/PhaseCompAcq/PhaseCompAcq.pro index 7da4dd1..5eef2d1 100644 --- a/PhaseCompAcq/PhaseCompAcq.pro +++ b/PhaseCompAcq/PhaseCompAcq.pro @@ -29,10 +29,9 @@ !isEmpty(target.path): INSTALLS += target -win32: LIBS += -L$$PWD/librdkafka/ -lrdkafka -lrdkafka++ +INCLUDEPATH += $$PWD/include/librdkafka +DEPENDPATH += $$PWD/include/librdkafka -INCLUDEPATH += $$PWD/librdkafka/include -DEPENDPATH += $$PWD/librdkafka/include +DISTFILES += conf/config.ini -DISTFILES += \ - conf/config.ini +unix:!macx: LIBS += -L$$PWD/lib/librdkafka/ -lrdkafka -lrdkafka++ diff --git a/PhaseCompAcq/common/utils/QKafkaUtil.h b/PhaseCompAcq/common/utils/QKafkaUtil.h index 106b289..f0a0427 100644 --- a/PhaseCompAcq/common/utils/QKafkaUtil.h +++ b/PhaseCompAcq/common/utils/QKafkaUtil.h @@ -3,8 +3,7 @@ #include -#include "librdkafka/include/rdkafkacpp.h" -#include "librdkafka/include/wingetopt.c" +#include "librdkafka/rdkafka.h" class QKafkaUtil : public QObject { diff --git a/PhaseCompAcq/conf/config.ini b/PhaseCompAcq/conf/config.ini index 6bd8c82..39c7e01 100644 --- a/PhaseCompAcq/conf/config.ini +++ b/PhaseCompAcq/conf/config.ini @@ -3,3 +3,6 @@ portNames="COM1,COM2,COM3" devCodes="9101,9102,9103" baudRate=115200 + +[kafka] +brokers="111.198.10.15:12502"