Add BUILD_RTI conditionals for RTI/DDS dependent libraries
Systematic fix for BUILD_RTI conditional compilation: - Lts/Common: Wrap all DDS-dependent libraries in IF(BUILD_RTI) - LtsAppManager, LtsCoordTrans, LtsCoordinate, LtsLogin - LtsMultiMonitor, LtsPluginManager, LtsPrinting - LtsProjectionWorkstation, LtsScriptTimeline, LtsSession - LtsTimelineClassic, LtsUtilsCore, LtsUtilsGui, LtsUtilsGuiDds - Lts/DDS: Add BUILD_RTI guards to Core, DDSConnector, DdsUnitTests, FTC, FTS - Lts/Plugins: Add BUILD_RTI guards to FilterManagement, OperatorManagement, SituationReplayManagement - Lts/Proxies: Add BUILD_RTI guards to Buildings, CombatNetRadio, ComponentMonitor, GuezNasat, TrainingAreaBase, TrainingAreaBaseOC - Lts/Services: Add BUILD_RTI guards to all 30+ service modules - Z/nglwidgets: Add BUILD_RTI guards, fix Poppler Qt6 headers Qt6 compatibility fixes: - LtsCoordTrans: QOverload signal signature, QChar constructor - LtsMultiMonitor: setMargin→setContentsMargins, remove deprecated HighQualityAntialiasing - nglwidgets: Poppler Qt5→Qt6 header migration - Add FindPopplerQt6.cmake for Qt6 Poppler detection Part of Qt5→Qt6 migration with RTI DDS support.
This commit is contained in:
78 files changed
+265
-114
No files matched your search
@@ -45,14 +45,14 @@ endif()
|
||||
NGL_ADD_LIBRARY(WS AAR SV nglwidgets SHARED ${nglwidgets_SRCS} ${oxygen_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(nglwidgets
|
||||
PRIVATE
|
||||
${POPPLER_QT5_INCLUDE_DIR}
|
||||
${POPPLER_QT6_INCLUDE_DIR}
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(nglwidgets
|
||||
PRIVATE
|
||||
NGLLogger
|
||||
ngltranslator
|
||||
ngltools
|
||||
${POPPLER_QT5_LIBRARY}
|
||||
${POPPLER_QT6_LIBRARY}
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QPointer>
|
||||
#include <poppler/qt5/poppler-qt5.h>
|
||||
#include <poppler/qt6/poppler-qt6.h>
|
||||
|
||||
#include "nglwidgets_export.h"
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <QtCore/QSizeF>
|
||||
#include <QWidget>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <poppler/qt5/poppler-qt5.h>
|
||||
#include <poppler/qt6/poppler-qt6.h>
|
||||
#include <vector>
|
||||
#include <memory>
|
||||
|
||||
|
||||
Reference in new issue
Block a user