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
@@ -5,29 +5,28 @@
|
||||
# Created by Mike Wille, SLSE, 2016-05-15
|
||||
#
|
||||
|
||||
|
||||
# LtsSessionDataDds (only with RTI)
|
||||
IF(BUILD_RTI)
|
||||
# LtsSessionDataDds
|
||||
SET(LtsSessionDataDds_SRCS
|
||||
lts_session_data_dds.cpp
|
||||
lts_session_data_dds.h
|
||||
)
|
||||
NGL_ADD_LIBRARY2(WS LtsSessionDataDds SHARED ${LtsSessionDataDds_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionDataDds
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
|
||||
PRIVATE
|
||||
ddsconnector
|
||||
PUBLIC
|
||||
ddscore
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
ENDIF(BUILD_RTI)
|
||||
SET(LtsSessionDataDds_SRCS
|
||||
lts_session_data_dds.cpp
|
||||
lts_session_data_dds.h
|
||||
)
|
||||
NGL_ADD_LIBRARY2(WS LtsSessionDataDds SHARED ${LtsSessionDataDds_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionDataDds
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
|
||||
PRIVATE
|
||||
ddsconnector
|
||||
PUBLIC
|
||||
RTI::nddscore
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
|
||||
|
||||
@@ -41,7 +40,6 @@ SET(ltssession_SRCS
|
||||
lts_session_lock_handler.cpp
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_ADD_LIBRARY2(WS LtsSession SHARED ${ltssession_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSession
|
||||
PUBLIC
|
||||
@@ -53,6 +51,7 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
Qt6::Network
|
||||
LtsMultiMonitor
|
||||
LtsSessionData
|
||||
ddsconnector
|
||||
LtsUtilsGuiDds # ReqHelpr & for Debug Menu ! TODO: rm on release!
|
||||
LtsNotification
|
||||
svcCoreClient # Core Ftc - for TLH
|
||||
@@ -66,16 +65,12 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
NGLLogger
|
||||
ProjectConfig
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
PRIVATE
|
||||
ddsconnector
|
||||
PUBLIC
|
||||
LtsSessionDataDds
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
ENDIF(BUILD_RTI)
|
||||
ENDIF()
|
||||
|
||||
|
||||
# LtsSessionData (avoid cross-deps between AppManager, Session and PluginManager)
|
||||
@@ -96,12 +91,9 @@ NGL_TARGET_LINK_LIBRARIES(LtsSessionData
|
||||
Qt6::Core
|
||||
Qt6::Gui # QPixmap as Storage for Profile Picture
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSessionData
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSessionData
|
||||
PUBLIC
|
||||
ddscore
|
||||
RTI::nddscore
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
ENDIF(BUILD_RTI)
|
||||
ENDIF()
|
||||
Reference in new issue
Block a user