Behebt strikt nur die verbleibenden Linker-Fehler ("undefined reference") im Docker-Build der Qt6-Migration.

This commit is contained in:
torsten committed 2026-09-12 11:57:41 +00:00
1 parent 50c4a6fbc0
commit 710f7ad475
5 files changed
+23 -5

No files matched your search

@@ -50,10 +50,16 @@ ENDIF()
NGL_ADD_LIBRARY2(WS AAR HLA SV ddscore SHARED ${SRCS_common})
# Add RTI compile definitions explicitly (required for RTI headers to compile)
TARGET_COMPILE_DEFINITIONS(ddscore PRIVATE
RTI_UNIX
RTI_LINUX
RTI_64BIT
# NDDS_USER_SYMBOL_EXPORT triggers visibility attributes in RTI-generated code
# without the later undef that happens with NDDS_USER_DLL_EXPORT
TARGET_COMPILE_DEFINITIONS(ddscore
PRIVATE
RTI_UNIX
RTI_LINUX
RTI_64BIT
MAKE_DDSCORE_LIB
PUBLIC
NDDS_USER_SYMBOL_EXPORT
)
# Skip AUTOMOC for generated header - it will be processed manually with correct dependencies
@@ -26,7 +26,7 @@
# ifdef BUILD_STATIC_LIBRARIES
# define CORE_CLIENT_EXPORT
# else
# if defined(MAKE_SVCCORECLIENT_LIB)
# if defined(MAKE_DDSCORE_LIB) || defined(MAKE_SVCCORECLIENT_LIB)
# define CORE_CLIENT_EXPORT Q_DECL_EXPORT
# else
# define CORE_CLIENT_EXPORT Q_DECL_IMPORT
@@ -2,6 +2,9 @@
#include <QtCore/QSet>
#include <QtCore/QString>
#include <QObject>
#include <Core/core_export.h>
#if BUILD_RTI
#include <Core/core_dtc.h>
@@ -35,6 +35,7 @@ SET(RmeLightStylePlugin_SRCS
NGL_ADD_BIG_RESOURCES(RmeLightStylePlugin_QRC resources/rme_light_style.qrc)
NGL_ADD_LIBRARY(AAR SV WS RmeLightStyleQrc STATIC ${RmeLightStylePlugin_QRC})
set_target_properties(RmeLightStyleQrc PROPERTIES POSITION_INDEPENDENT_CODE ON)
NGL_ADD_LIBRARY(AAR SV WS RmeLightStylePlugin MODULE ${RmeLightStylePlugin_SRCS})
@@ -1,8 +1,16 @@
#!/bin/bash
set -e
# Load environment variables from .envrc if it exists
if [ -f .envrc ]; then
set -a
source .envrc
set +a
fi
# Run CMake configuration and build inside Docker
docker run --rm \
-e MIGRATE_PIPELINE_ROOT \
-v ${MIGRATE_PIPELINE_ROOT}:/workspace \
-v ${MIGRATE_PIPELINE_ROOT}/rti_license.dat:/workspace/rti_license.dat \
-w /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus \