Resolves latest issues in Lts/Common Lts/DDS

2026-09-06 18:45:59 +02:00
1 parent e398f4903d
commit b656e1aaa9
@@ -37,12 +37,29 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
 # generate core_[d|f]tc.h
 CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})

+# Get the generated core_dtc.h path for manual MOC handling
+SET(CORE_DTC_H_GENERATED "${CMAKE_CURRENT_BINARY_DIR}/core_dtc.h")
+
 NGL_ADD_LIBRARY2(WS AAR HLA SV ddscore SHARED ${SRCS_common})
+
+# Skip AUTOMOC for generated header - it will be processed manually with correct dependencies
+SET_SOURCE_FILES_PROPERTIES(${CORE_DTC_H_GENERATED} PROPERTIES SKIP_AUTOMOC ON)
+
+# Ensure AUTOMOC can find generated headers - add include path
+TARGET_INCLUDE_DIRECTORIES(ddscore
+  PUBLIC
+    ${CMAKE_CURRENT_BINARY_DIR}/../../
+)
 NGL_TARGET_INCLUDE_DIRECTORIES(ddscore
  PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/../../
-    ${CMAKE_CURRENT_BINARY_DIR}/../../
 )
+
+# Manually add MOC for the generated core_dtc.h with proper include paths
+QT6_WRAP_CPP(ddscore_moc_sources ${CORE_DTC_H_GENERATED} 
+  OPTIONS --include core_dtc.h -I${CMAKE_CURRENT_BINARY_DIR}/../.. -I${CMAKE_CURRENT_SOURCE_DIR}/../..
+)
+TARGET_SOURCES(ddscore PRIVATE ${ddscore_moc_sources})
 IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(ddscore
  PRIVATE
@@ -20,7 +20,7 @@ SET(SRCS

 NGL_ADD_LIBRARY2(AAR SV WS HLA ddsconnector SHARED ${SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(ddsconnector
-  INTERFACE
+  PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/../../
    ${CMAKE_SOURCE_DIR}
 )
@@ -5,6 +5,7 @@
 #include "generic_dtc.h"

 #include <DDS/Generic/generic_data_reader.h>
+#include <DDS/Generic/generic_logger.h>
 #include <DDS/Generic/subscriber_listener.h>
 #include <QtCore/QTimer>
 #include <dds/core/cond/StatusCondition.hpp>
@@ -475,7 +475,7 @@ class GenericFtcImpl final : public GenericFtc<TOPICTYPE_REQUEST, TOPICTYPE_REPL

    bool checkSlots(ClassicRequest& request, const char* replySlot, const char* errorSlot)
    {
-        const QByteArray baReply = QByteArray::number(QSIGNAL_CODE) + "signalSignature(" +
+        const QByteArray baReply = QString::number(QSIGNAL_CODE).toLatin1() + "signalSignature(" +
                                   TopicNameHelper::replyTopicTypeName() + ",int,bool)";
        request.replySlot = DDS::Helper::getMethod(m_logger, m_objToInform, replySlot, baReply.data());
        if (!request.replySlot.isValid())
@@ -483,7 +483,7 @@ class GenericFtcImpl final : public GenericFtc<TOPICTYPE_REQUEST, TOPICTYPE_REPL

        if (errorSlot)
        {
-            const QByteArray baError = QByteArray::number(QSIGNAL_CODE) + "signalSignature(int,int,int)";
+            const QByteArray baError = QString::number(QSIGNAL_CODE).toLatin1() + "signalSignature(int,int,int)";
            request.errorSlot = DDS::Helper::getMethod(m_logger, m_objToInform, errorSlot, baError.data());
            if (!request.errorSlot.isValid())
                return false;
@@ -31,7 +31,7 @@ inline QByteArray toReadable(const rti::core::Guid& guid)

 inline QByteArray toReadable(const rti::core::SequenceNumber& seqNo, const rti::core::Guid& guid)
 {
-    return "SeqNo: " + QByteArray::number(seqNo.value()) + ", Guid-DW: " + toReadable(guid);
+    return "SeqNo: " + QString::number(seqNo.value()).toLatin1() + ", Guid-DW: " + toReadable(guid);
 }

 inline QByteArray toReadable(const rti::core::SampleIdentity& identiy)
@@ -331,7 +331,7 @@ template <typename TOPICTYPE> class GenericDataReaderContentFilter final : publi
        {
            qint64 ptr = reinterpret_cast<qint64>(this);
            const QByteArray name = QByteArray(DDS::topic_type_name<TopicType>::value().c_str()) +
-                                    "- content filter 0x" + QByteArray::number(ptr, 16);
+                                    "- content filter 0x" + QString::number(ptr, 16).toLatin1();
            m_filteredTopic = dds::topic::ContentFilteredTopic<TopicType>(BaseClass::m_ddsTopic, name.data(), m_filter);
            BaseClass::m_dataReader = DataReader(ddsSubscriber, m_filteredTopic);
        }
@@ -24,7 +24,7 @@ ENDIF()
 NGL_ADD_LIBRARY2(AAR SV HLA WS ddsQoS SHARED ${SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(ddsQoS
  INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../
 )
 NGL_TARGET_LINK_LIBRARIES(ddsQoS
  PRIVATE
@@ -21,7 +21,7 @@ static inline QByteArray toReadable(const rti::core::Guid& guid)

 static inline QByteArray toReadable(const rti::core::SequenceNumber& seqNo, const rti::core::Guid& guid)
 {
-    return "SeqNo: " + QByteArray::number(seqNo.value()) + ", Guid-DW: " + toReadable(guid);
+    return "SeqNo: " + QString::number(seqNo.value()).toLatin1() + ", Guid-DW: " + toReadable(guid);
 }

 static inline QByteArray toReadable(const rti::core::SampleIdentity& identiy)