Remove STUB files, use real dependencies
- Removed all STUB files for external dependencies: - lts_session_stub.h/cpp - lts_session_data_dds_stub.h/cpp - lts_session_lock_handler_stub.h - elevation_map_manager.h/cpp (entire ElevationMap STUB) - avm_enums_stub.hpp - Test files for STUBs - Updated LtsSession/CMakeLists.txt: - Removed conditional BUILD_RTI logic for STUBs - Always use real implementation files - BUILD_RTI=ON is now the default - External dependencies are now expected in ./external/ - RTI Connext DDS 7.7.0 - ArcGIS SDK (runtime mount) - Other deps to be integrated step by step Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
12 files changed
+26
-821
No files matched your search
@@ -5,6 +5,24 @@
|
||||
# Created by Mike Wille, SLSE, 2016-05-15
|
||||
#
|
||||
|
||||
# RTI Connext DDS - default ON
|
||||
OPTION(BUILD_RTI "Build with RTI Connext DDS support" ON)
|
||||
|
||||
# Find RTI Connext DDS
|
||||
IF(BUILD_RTI)
|
||||
# Try to find RTI in external directory first, then system paths
|
||||
FIND_PACKAGE(RTIConnextDDS 7.7.0 QUIET
|
||||
PATHS "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0"
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
IF(NOT RTIConnextDDS_FOUND)
|
||||
FIND_PACKAGE(RTIConnextDDS 7.7.0 QUIET)
|
||||
ENDIF()
|
||||
IF(NOT RTIConnextDDS_FOUND)
|
||||
MESSAGE(WARNING "RTI Connext DDS not found, building without RTI support")
|
||||
SET(BUILD_RTI OFF)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
# LtsSessionDataDds (only with RTI)
|
||||
IF(BUILD_RTI)
|
||||
@@ -26,44 +44,19 @@ IF(BUILD_RTI)
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
)
|
||||
ELSE()
|
||||
# Stub version for BUILD_RTI=OFF
|
||||
SET(LtsSessionDataDds_SRCS
|
||||
lts_session_data_dds_stub.cpp
|
||||
lts_session_data_dds_stub.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
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
|
||||
|
||||
# LtsSession (RTI dependencies optional)
|
||||
IF(BUILD_RTI)
|
||||
SET(ltssession_SRCS
|
||||
lts_session.h
|
||||
lts_session.cpp
|
||||
lts_session_lock_handler.h
|
||||
lts_session_manager.h
|
||||
lts_session_manager.cpp
|
||||
lts_session_lock_handler.cpp
|
||||
)
|
||||
ELSE()
|
||||
# Stub version for BUILD_RTI=OFF
|
||||
SET(ltssession_SRCS
|
||||
lts_session_stub.h
|
||||
lts_session_stub.cpp
|
||||
lts_session_lock_handler.h
|
||||
)
|
||||
ENDIF()
|
||||
SET(ltssession_SRCS
|
||||
lts_session.h
|
||||
lts_session.cpp
|
||||
lts_session_lock_handler.h
|
||||
lts_session_manager.h
|
||||
lts_session_manager.cpp
|
||||
lts_session_lock_handler.cpp
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY2(WS LtsSession SHARED ${ltssession_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSession
|
||||
|
||||
Reference in new issue
Block a user