Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78253c60f4 | ||
|
|
1e07bf76ba | ||
|
|
985aa9787b | ||
|
|
ed81fccb1d | ||
|
|
43300efaa7 | ||
|
|
7b090a26ca | ||
|
|
1bcc7e4855 | ||
|
|
ab1cf60643 | ||
|
|
3f8a7eccfd | ||
|
|
d8ec9e8d74 |
No files matched your search
@@ -4,8 +4,6 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
IF(BUILD_RTI)
|
||||
ADD_SUBDIRECTORY(CoPrtCnv)
|
||||
ADD_SUBDIRECTORY(LogView)
|
||||
ADD_SUBDIRECTORY(PrtCnv)
|
||||
ENDIF()
|
||||
@@ -23,7 +23,6 @@ find_package(Qt6 COMPONENTS Core QUIET)
|
||||
if (Qt6_FOUND)
|
||||
set(_QT_CORE_TARGET Qt6::Core)
|
||||
else()
|
||||
find_package(Qt6 COMPONENTS Core QUIET)
|
||||
set(_QT_CORE_TARGET Qt6::Core)
|
||||
endif()
|
||||
NGL_TARGET_LINK_LIBRARIES(CoPrtCnv
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtGui/QAbstractTableModel>
|
||||
#include <QtCore/QAbstractTableModel>
|
||||
#include <QtCore/QSharedPointer>
|
||||
#include <QtCore/QSet>
|
||||
#include "LogViewTelegram.hpp"
|
||||
|
||||
@@ -35,7 +35,7 @@ TetraIF::TetraIF(const QHostAddress &addr, unsigned short port, unsigned short i
|
||||
connect(m_socket, &QTcpSocket::connected, this, &TetraIF::onConnected);
|
||||
connect(m_socket, &QTcpSocket::disconnected, this, &TetraIF::onDisconnected);
|
||||
connect(m_socket, &QTcpSocket::readyRead, this, &TetraIF::onReadyRead);
|
||||
connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &TetraIF::onError);
|
||||
connect(m_socket, &QAbstractSocket::errorOccurred, this, &TetraIF::onError);
|
||||
|
||||
m_outputDir = QCoreApplication::applicationDirPath();
|
||||
m_outputDir += QLatin1Char('/') + QString::number(m_issi) + QLatin1Char('-');
|
||||
|
||||
@@ -53,7 +53,7 @@ static std::string threadIdToString(PrtCnvApplication::E_ThreadId id)
|
||||
PrtCnvApplication::PrtCnvApplication()
|
||||
: m_Config(nullptr)
|
||||
, m_exerciseId(0)
|
||||
, m_accessMutex(QMutex::Recursive)
|
||||
, m_logger(getLogger("PrtCnvApplication"))
|
||||
{}
|
||||
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "logger.h"
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtCore/QRecursiveMutex>
|
||||
#include "prtcnvlib_export.h"
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
|
||||
@@ -165,7 +166,7 @@ protected:
|
||||
|
||||
|
||||
|
||||
mutable QMutex m_accessMutex;
|
||||
mutable QRecursiveMutex m_accessMutex;
|
||||
|
||||
QString m_dbDriver;
|
||||
QString m_dbHostName;
|
||||
@@ -173,6 +174,8 @@ protected:
|
||||
QString m_dbSchemaName;
|
||||
QString m_dbUserName;
|
||||
QString m_dbPassword;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -35,8 +35,9 @@ PrtCnvBroadcastMgr::PrtCnvBroadcastMgr() : m_ClaimWindow(0)
|
||||
, m_IsFullLoad(false)
|
||||
, m_FinishedBroadcastIndex(0)
|
||||
, m_FirstBroadcastIndexOfBc1(0)
|
||||
, m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest")),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
, m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest"))
|
||||
, m_logger(getLogger("PrtCnvBroadcastMgr"))
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -350,6 +350,7 @@ Q_SIGNALS:
|
||||
void areaEffectSimulationDeactivated(int wirkfeldKennung);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
NGL::INGLLogger &m_loggerBcRequest;
|
||||
};
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>
|
||||
|
||||
#include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
#include <LtsUtilsCore/dds_bitarray.h>
|
||||
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
@@ -43,13 +43,13 @@ PrtCnvDbThread::PrtCnvDbThread(const QString &dbDriver,
|
||||
const QString &dbPassword,
|
||||
PrtCnv::PrtCnvThreadStarter *a_parent)
|
||||
: PrtCnvThread(a_parent, "PrtCnvDbThread")
|
||||
, m_BattleFieldOpStateMutex(QMutex::Recursive)
|
||||
, m_MemberListByIdMutex(QMutex::Recursive)
|
||||
, m_CentralListMutex(QMutex::Recursive)
|
||||
, m_BattleFieldOpStateMutex()
|
||||
, m_MemberListByIdMutex()
|
||||
, m_CentralListMutex()
|
||||
, m_OldCentralAckCounter(0)
|
||||
, m_RadioListMutex(QMutex::Recursive)
|
||||
, m_SqlCmdListMutex(QMutex::Recursive)
|
||||
, m_BroadcastMapMutex(QMutex::Recursive)
|
||||
, m_RadioListMutex()
|
||||
, m_SqlCmdListMutex()
|
||||
, m_BroadcastMapMutex()
|
||||
, m_DoClean(false)
|
||||
, m_DoWaitUntilSqlWritten(false)
|
||||
, m_DoStorePermanent(false)
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
#include <QtCore/QAtomicInt>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtCore/QRecursiveMutex>
|
||||
#include <QtCore/QString>
|
||||
#include <QtSql/QSqlDatabase>
|
||||
#include "PrtCnvThread.hpp"
|
||||
@@ -213,15 +214,15 @@ namespace PrtCnv
|
||||
|
||||
|
||||
|
||||
mutable QMutex m_BattleFieldOpStateMutex;
|
||||
mutable QRecursiveMutex m_BattleFieldOpStateMutex;
|
||||
|
||||
|
||||
|
||||
mutable QMutex m_MemberListByIdMutex;
|
||||
mutable QRecursiveMutex m_MemberListByIdMutex;
|
||||
|
||||
|
||||
|
||||
mutable QMutex m_CentralListMutex;
|
||||
mutable QRecursiveMutex m_CentralListMutex;
|
||||
|
||||
|
||||
|
||||
@@ -238,16 +239,16 @@ namespace PrtCnv
|
||||
std::list<PrtCnvStoredRadioTelegram*> m_RadioList;
|
||||
|
||||
|
||||
mutable QMutex m_RadioListMutex;
|
||||
mutable QRecursiveMutex m_RadioListMutex;
|
||||
|
||||
|
||||
std::vector<QString> m_SqlCommandList;
|
||||
|
||||
|
||||
mutable QMutex m_SqlCmdListMutex;
|
||||
mutable QRecursiveMutex m_SqlCmdListMutex;
|
||||
|
||||
|
||||
mutable QMutex m_BroadcastMapMutex;
|
||||
mutable QRecursiveMutex m_BroadcastMapMutex;
|
||||
|
||||
|
||||
std::list<PrtCnvStoredRadioTelegram*> m_BroadcastList;
|
||||
|
||||
@@ -25,6 +25,7 @@ namespace PrtCnv
|
||||
PrtCnvInjectionSocket::PrtCnvInjectionSocket()
|
||||
: m_Socket(nullptr)
|
||||
, m_Server(nullptr)
|
||||
, m_logger(getLogger("PrtCnvInjectionSocket"))
|
||||
{}
|
||||
|
||||
PrtCnvInjectionSocket::~PrtCnvInjectionSocket()
|
||||
|
||||
@@ -39,6 +39,8 @@ namespace PrtCnv
|
||||
QTcpSocket *m_Socket;
|
||||
|
||||
PrtCnvInjectionThread *m_Server;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
protected slots:
|
||||
|
||||
|
||||
|
||||
@@ -89,8 +89,7 @@ PrtCnvRadioThread::PrtCnvRadioThread(int exerciseId, PrtCnvThreadStarter *a_pare
|
||||
m_ReceivedBytes(0),
|
||||
m_bUseScrambling(false),
|
||||
m_loggerStats(getLogger("PrtCnvRadioThread.statistic")),
|
||||
m_exerciseEquipmentAssignmentMutex(QMutex::Recursive),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_exerciseEquipmentAssignmentMutex() {
|
||||
m_Name = QStringLiteral("Radio");
|
||||
for (int i = 0; i < AVERAGE_COUNT; ++i)
|
||||
{
|
||||
@@ -176,8 +175,8 @@ int32_t PrtCnvRadioThread::init()
|
||||
m_DbThread->licenseMember(m_DbThread->addMember(0, m_BroadcastISSI));
|
||||
|
||||
QString groupString = m_Config->getString(getName(), QStringLiteral("ListenGroups"), QString());
|
||||
const QVector<QStringView> groups = groupString.splitView(QLatin1Char(','), Qt::SkipEmptyParts);
|
||||
for (const QStringView &sr : groups)
|
||||
const QStringList groups = groupString.split(QLatin1Char(','), Qt::SkipEmptyParts);
|
||||
for (const QString &sr : groups)
|
||||
{
|
||||
uint32_t group = sr.toUInt();
|
||||
if (group > 0)
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <set>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtCore/QRecursiveMutex>
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
|
||||
#define MAX_IDENTITY 65535
|
||||
@@ -263,7 +264,7 @@ public:
|
||||
|
||||
std::unordered_map<int, std::unordered_set<int>> m_exerciseEquipmentAssignments;
|
||||
std::unordered_map<int, TrainingAreaBase::TetraIcd::GroupIssiInformation> m_groupIssiInformation;
|
||||
mutable QMutex m_exerciseEquipmentAssignmentMutex;
|
||||
mutable QRecursiveMutex m_exerciseEquipmentAssignmentMutex;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ PrtCnvRadioTrafficThread::PrtCnvRadioTrafficThread(PrtCnvThreadStarter* a_parent
|
||||
, m_hystLoad(5)
|
||||
, m_calcTimeout(1000)
|
||||
, m_cleanupTimeout(5000)
|
||||
, m_mutex(QMutex::Recursive)
|
||||
, m_mutex()
|
||||
{}
|
||||
|
||||
void PrtCnvRadioTrafficThread::newTelegramArrived(unsigned int size)
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "PrtCnvRadioThread.hpp"
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtCore/QRecursiveMutex>
|
||||
|
||||
namespace PrtCnv
|
||||
{
|
||||
@@ -72,7 +73,7 @@ protected:
|
||||
|
||||
|
||||
|
||||
QMutex m_mutex;
|
||||
QRecursiveMutex m_mutex;
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -100,7 +100,7 @@ void PrtCnvSocketThread::createNewSocket()
|
||||
|
||||
connect(m_Socket, &QTcpSocket::connected, this, &PrtCnvSocketThread::connected, Qt::QueuedConnection);
|
||||
connect(m_Socket, &QTcpSocket::disconnected, this, &PrtCnvSocketThread::disconnected, Qt::QueuedConnection);
|
||||
connect(m_Socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &PrtCnvSocketThread::error, Qt::QueuedConnection);
|
||||
connect(m_Socket, &QAbstractSocket::errorOccurred, this, &PrtCnvSocketThread::error, Qt::QueuedConnection);
|
||||
connect(m_Socket, &QTcpSocket::hostFound, this, &PrtCnvSocketThread::hostFound, Qt::QueuedConnection);
|
||||
connect(m_Socket, &QTcpSocket::stateChanged, this, &PrtCnvSocketThread::stateChanged);
|
||||
connect(m_Socket, &QTcpSocket::readyRead, this, &PrtCnvSocketThread::readyRead, Qt::QueuedConnection);
|
||||
|
||||
@@ -36,6 +36,8 @@ protected:
|
||||
|
||||
|
||||
Qt::HANDLE m_currentThreadId;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
public:
|
||||
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@ PrtCnvThreadStarter::PrtCnvThreadStarter(const PrtCnv::PrtCnvApplication::E_Thre
|
||||
, m_Application(a_mainApp)
|
||||
, m_Id(a_id)
|
||||
, m_settings(new NGL::Settings(configFileName))
|
||||
, m_logger(getLogger("PrtCnvThreadStarter"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Using Config file '" << configFileName << "'";
|
||||
}
|
||||
|
||||
@@ -41,6 +41,8 @@ protected:
|
||||
|
||||
|
||||
NGL::Settings *m_settings;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
public:
|
||||
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ bool TTWorker::init()
|
||||
{
|
||||
connect(m_socket, &QTcpSocket::disconnected,
|
||||
this, &TTWorker::deleteLater);
|
||||
connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error),
|
||||
connect(m_socket, &QAbstractSocket::errorOccurred,
|
||||
this, &TTWorker::onSocketError);
|
||||
connect(m_socket, &QTcpSocket::readyRead,
|
||||
this, &TTWorker::onReadyRead);
|
||||
|
||||
@@ -958,10 +958,55 @@ GROUP6_TARGETS=(
|
||||
tDataSampleReceiver
|
||||
DateTimeSyncer
|
||||
ddsview
|
||||
# ddsview runtime topic-type plugins (39 *TopicTypePlugin.so). Not CMake link deps of
|
||||
# ddsview (loaded at runtime via LtsPluginLoader), so `make ddsview` alone skips them and
|
||||
# ddsview shows empty Data/Function topic lists. Built here alongside ddsview.
|
||||
aesTopicTypePlugin
|
||||
almTopicTypePlugin
|
||||
asmTopicTypePlugin
|
||||
avmTopicTypePlugin
|
||||
bldTopicTypePlugin
|
||||
cesTopicTypePlugin
|
||||
cmoTopicTypePlugin
|
||||
codTopicTypePlugin
|
||||
coreTopicTypePlugin
|
||||
eemTopicTypePlugin
|
||||
escTopicTypePlugin
|
||||
esmTopicTypePlugin
|
||||
evlTopicTypePlugin
|
||||
exmTopicTypePlugin
|
||||
flmTopicTypePlugin
|
||||
fltTopicTypePlugin
|
||||
gimTopicTypePlugin
|
||||
gnaTopicTypePlugin
|
||||
ismTopicTypePlugin
|
||||
mdmTopicTypePlugin
|
||||
mrkTopicTypePlugin
|
||||
msgTopicTypePlugin
|
||||
nmeTopicTypePlugin
|
||||
nomTopicTypePlugin
|
||||
obdTopicTypePlugin
|
||||
opmTopicTypePlugin
|
||||
oscTopicTypePlugin
|
||||
ossTopicTypePlugin
|
||||
pdmTopicTypePlugin
|
||||
ppmTopicTypePlugin
|
||||
preTopicTypePlugin
|
||||
repTopicTypePlugin
|
||||
scmTopicTypePlugin
|
||||
somTopicTypePlugin
|
||||
srpTopicTypePlugin
|
||||
tabTopicTypePlugin
|
||||
tabocTopicTypePlugin
|
||||
tgtTopicTypePlugin
|
||||
whgTopicTypePlugin
|
||||
displayPanelSimulator
|
||||
LicenceEditor
|
||||
localDomainFinder
|
||||
LogViewer
|
||||
CoPrtCnv
|
||||
PrtCnvLib
|
||||
PrtCnv
|
||||
)
|
||||
|
||||
# Group 7: LTS Tools A,B,C,E,I directories (Qt6 migration targets)
|
||||
@@ -1171,6 +1216,45 @@ run_build_group() {
|
||||
fi
|
||||
}
|
||||
|
||||
# Ensure a local PostgreSQL DB is available for the DB tools (dbUpdate, dbAdministration, ...).
|
||||
# Checks whether the server is pre-installed (baked into the image); if not, installs
|
||||
# postgresql-18. Then maps EXCDBS01/EXCADB01 -> 127.0.0.1 and starts the cluster, seeding
|
||||
# the roles (postgres, ctc_sv) + databases (lts_ets_pro, dbAdmin) the tools connect with.
|
||||
# Entirely non-fatal: a DB problem must never abort the build.
|
||||
ensure_database() {
|
||||
log_info "Checking for a pre-installed PostgreSQL server..."
|
||||
if ls /usr/lib/postgresql/*/bin/postgres >/dev/null 2>&1; then
|
||||
log_info "PostgreSQL server already installed - skipping apt install"
|
||||
else
|
||||
log_info "PostgreSQL server not found - installing postgresql-18"
|
||||
apt-get update -qq || true
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y -qq postgresql-18 >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
# Map the app's DB hostnames to the local server + start the cluster (idempotent).
|
||||
grep -qE 'EXCDBS01' /etc/hosts || echo '127.0.0.1 EXCDBS01 EXCADB01' >> /etc/hosts
|
||||
pg_ctlcluster 18 main start >/dev/null 2>&1 || true
|
||||
sleep 1
|
||||
|
||||
# Ensure the roles + databases the DB tools use (idempotent; login password is 'postgres').
|
||||
su postgres -c "psql -c \"ALTER USER postgres PASSWORD 'postgres'\"" >/dev/null 2>&1 || true
|
||||
if ! su postgres -c "psql -tAc \"SELECT 1 FROM pg_roles WHERE rolname='ctc_sv'\"" 2>/dev/null | grep -q 1; then
|
||||
su postgres -c "psql -c \"CREATE ROLE ctc_sv LOGIN PASSWORD 'postgres' CREATEDB\"" >/dev/null 2>&1 || true
|
||||
fi
|
||||
if ! su postgres -c "psql -tAc \"SELECT 1 FROM pg_database WHERE datname='lts_ets_pro'\"" 2>/dev/null | grep -q 1; then
|
||||
su postgres -c "createdb -O postgres lts_ets_pro" >/dev/null 2>&1 || true
|
||||
fi
|
||||
if ! su postgres -c "psql -tAc \"SELECT 1 FROM pg_database WHERE datname='dbAdmin'\"" 2>/dev/null | grep -q 1; then
|
||||
su postgres -c "createdb -O postgres dbAdmin" >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
if pg_isready -h 127.0.0.1 -p 5432 >/dev/null 2>&1; then
|
||||
log_info "PostgreSQL ready on 127.0.0.1:5432 (roles postgres/ctc_sv, dbs lts_ets_pro/dbAdmin)"
|
||||
else
|
||||
log_info "WARNING: PostgreSQL not ready on 127.0.0.1:5432 (DB tools may not connect; install may have failed)"
|
||||
fi
|
||||
}
|
||||
|
||||
if [[ "${USE_PREBUILT_IMAGE}" == "ON" ]]; then
|
||||
log_info "Using prebuilt Docker image - skipping apt-get install and Qt6 package installation"
|
||||
else
|
||||
@@ -1183,6 +1267,9 @@ else
|
||||
install_qt6_packages
|
||||
fi
|
||||
|
||||
# Ensure the local PostgreSQL DB (dbUpdate / dbAdministration, ...) is available before the build.
|
||||
ensure_database
|
||||
|
||||
export RTI_LICENSE_FILE=/workspace/rti_license.dat
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
#-----------------------------------------------------------------
|
||||
# Issued to: Test on Wed Sep 23 17:48:43 2026
|
||||
# Contact: Moi Meme Phone: ...
|
||||
# email: berrux@outlook.de
|
||||
# Do NOT edit this file.
|
||||
SERVER <embedded> ffffffff 1700
|
||||
FEATURE RTIPRO RTI 4. 20-nov-2026 0 F8031B976E72D17E8B03 "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on"
|
||||
FEATURE RTISECURITY RTI 5. 20-nov-2026 0 B6F179F2381FC5CAE4DF "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on"
|
||||
FEATURE RTIRWT RTI 6. 20-nov-2026 0 EE2FBD16BE636F7CAD9E "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on"
|
||||
FEATURE RTICDS RTI 6. 20-nov-2026 0 15B75FC1054D5E39A55D "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on"
|
||||
@@ -101,34 +101,34 @@ if(BUILD_TESTING)
|
||||
endif()
|
||||
|
||||
# Exclude LTS Tools tests when corresponding targets aren't available
|
||||
if(NOT TARGET DBAdministration)
|
||||
if(NOT TARGET dbAdministration)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_DBAdministration\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET DBOperatorSettingsRemover)
|
||||
if(NOT TARGET SettingsRemover)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_DBOperatorSettingsRemover\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET DBUpdate)
|
||||
if(NOT TARGET dbUpdate)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_DBUpdate\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET DataSampleGenerator)
|
||||
if(NOT TARGET tDataSampleGenerator)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_DataSampleGenerator\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET DataSampleReceiver)
|
||||
if(NOT TARGET tDataSampleReceiver)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_DataSampleReceiver\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET DateTimeSyncer)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_DateTimeSyncer\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET DdsView)
|
||||
if(NOT TARGET ddsview)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_DdsView\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET DotMatrixDisplay)
|
||||
if(NOT TARGET displayPanelSimulator)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_DotMatrixDisplay\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET LicenceEditor)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_LicenceEditor\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET LocalDomainFinder)
|
||||
if(NOT TARGET localDomainFinder)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_LocalDomainFinder\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET LogViewer)
|
||||
@@ -160,10 +160,10 @@ if(BUILD_TESTING)
|
||||
if(NOT TARGET ProjectSettingsEditor)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_ProjectSettingsEditor\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET QLedLine)
|
||||
if(NOT TARGET qledline)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_QLedLine\\.cpp")
|
||||
endif()
|
||||
if(NOT TARGET QLedMatrix)
|
||||
if(NOT TARGET qledmatrix)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_QLedMatrix\\.cpp")
|
||||
endif()
|
||||
# Group 9 (R,S,T,V,W) exclusions
|
||||
|
||||
Reference in new issue
Block a user