BUILD_RTI conditional fixes and Qt6 API updates
- cmake/FindRTI.cmake: Add INTERFACE placeholder targets when RTI not found - cmake/FindRTI.cmake: Force BUILD_RTI=OFF when RTI not installed - Lts/Common/LtsSession/CMakeLists.txt: Make LtsSessionDataDds conditional on BUILD_RTI - Lts/Viewer/CMakeLists.txt: Make LtsDataView conditional on BUILD_RTI - Lts/Plugins/*/CMakeLists.txt: 97 plugin files wrapped in BUILD_RTI conditionals - cmake/NGLMacros.cmake: Fix NGL_ADD_BIG_RESOURCES macro (removed premature return()) - Multiple Qt6 API fixes: QLinkedList→std::list, QStringRef→QStringView, etc. - BUILD_RTI_FIXES_SUMMARY.md: Comprehensive documentation of all fixes Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2065 files changed
+48219
-1763
No files matched your search
@@ -0,0 +1,21 @@
|
||||
/**
|
||||
* Export definitions for LtsUtilsCore
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
#ifndef LTSUTILSCORE_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define LTSUTILSCORE_EXPORT
|
||||
# else
|
||||
# if defined(MAKE_LTSUTILSCORE_LIB)
|
||||
# define LTSUTILSCORE_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define LTSUTILSCORE_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <QStringView>
|
||||
|
||||
#include <functional>
|
||||
#include <LtsUtilsCore/ltsutilscore_export.h>
|
||||
#include <ltsutilscore_export.h>
|
||||
|
||||
namespace LtsUtils
|
||||
{
|
||||
|
||||
+2
@@ -18,6 +18,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsGuiDds
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiDds
|
||||
@@ -42,6 +43,7 @@ NGL_ADD_LIBRARY2(AAR HLA SV LtsUtilsDds SHARED request_helper.cpp request_helpe
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsDds
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsUtilsDds
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsGuiDds/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
|
||||
|
||||
#include <QBuffer>
|
||||
#include <QFile>
|
||||
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
#ifndef LTSUTILSDDS_EXPORT_H
|
||||
#define LTSUTILSDDS_EXPORT_H
|
||||
|
||||
// Stub export header for BUILD_RTI=OFF case
|
||||
// When BUILD_RTI=ON, this file is generated by CMake's GENERATE_EXPORT_HEADER
|
||||
|
||||
#define LTSUTILSDDS_EXPORT
|
||||
#define LTSUTILSDDS_NO_EXPORT
|
||||
|
||||
#endif // LTSUTILSDDS_EXPORT_H
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#define LTSUTILSGUIDDS_INTERNAL_EXPORT LTSUTILSDDS_EXPORT
|
||||
#endif
|
||||
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <DDS/Core/core.hpp>
|
||||
|
||||
#include <QObject>
|
||||
|
||||
Reference in new issue
Block a user