Qt6 Migration: BUILD_RTI guards und CMake fixes
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
422 files changed
+1013
-599
No files matched your search
+5
-1
@@ -7,6 +7,8 @@
|
||||
*/
|
||||
|
||||
#include "handler_infrastructure_data.h"
|
||||
|
||||
#if BUILD_RTI
|
||||
#include "settings.h"
|
||||
|
||||
#include <QVector>
|
||||
@@ -16,7 +18,7 @@ using namespace VideoOverlayManagement;
|
||||
HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_exerciseId(0),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@@ -158,3 +160,5 @@ int HandlerInfrastructureData::getRoomIdFromAssetId(int assetId) const
|
||||
return m_assetId2RoomIdMap.value(assetId, -1);
|
||||
} // end of getRoomIdFromAssetId()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#endif // BUILD_RTI
|
||||
Reference in new issue
Block a user