BUILD_RTI: Fix 4 compile errors and add missing type headers
- generic_base.h: Fix dds::topic namespace issue, move RTI includes inside BUILD_RTI guard - wait_set_handler.h: Remove duplicate m_logger declarations (3→1) - pub_sub_base.cpp: Fix constructor initializer list syntax (.→,), add m_logger initialization - training_area_telegrams.h: Fix field naming (m_ prefix) for accessor methods - PdmComboBox CMakeLists.txt: Add BUILD_RTI AND TARGET guards for svcPdmCommon/svcPdmClient - PdmDataPlugin CMakeLists.txt: Wrap svcPdmClient link in BUILD_RTI guard - CMakeLists.txt: Add RTI_UNIX, RTI_POSIX_THREADS compile definitions, remove duplicate add_subdirectory - alm_types.h, ppm_types.h: Copy missing type headers from include/ directories Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
c042faae9e
commit
ec75789fae
9 files changed
+157
-40
No files matched your search
@@ -222,9 +222,11 @@ IF(BUILD_RTI)
|
||||
ENDIF()
|
||||
|
||||
# Include Verzeichnisse für alle Varianten
|
||||
# RTI_UNIX required for basic types (RTI_INT32, RTI_UINT32, etc.)
|
||||
# RTI_POSIX_THREADS required for pthread support
|
||||
SET_TARGET_PROPERTIES(RTI::${lib} PROPERTIES
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${RTI_INCLUDE_DIRS}"
|
||||
INTERFACE_COMPILE_DEFINITIONS "RTI_LINUX"
|
||||
INTERFACE_COMPILE_DEFINITIONS "RTI_LINUX;RTI_UNIX;RTI_POSIX_THREADS"
|
||||
)
|
||||
ENDFOREACH()
|
||||
|
||||
@@ -470,12 +472,14 @@ endfunction()
|
||||
# Add only guarded subdirectories
|
||||
NGL_ADD_SUBDIR_GUARDED(TetraIF)
|
||||
NGL_ADD_SUBDIR_GUARDED(Z/src)
|
||||
# Services are included before plugins via Lts/CMakeLists.txt (LTS_SUBDIRS order)
|
||||
NGL_ADD_SUBDIR_GUARDED(Lts)
|
||||
# TrainingAreaBase is included via Lts/Proxies when Lts is processed
|
||||
# Special-case: when migrating TetraIF, also include ProjectDataManagement so generated headers
|
||||
# and internal logger target are available in the same build tree for TetraIF dependents.
|
||||
if(DEFINED MIGRATE_MODULE AND MIGRATE_MODULE STREQUAL "TetraIF")
|
||||
message(STATUS "Including helper modules for TetraIF migration: Lts/Plugins/ProjectDataManagement")
|
||||
# Services already included above when BUILD_RTI=ON
|
||||
add_subdirectory(Lts/Plugins/ProjectDataManagement)
|
||||
endif()
|
||||
# at last, to make sure we get all targets in NGL_TS_TARGETS property
|
||||
|
||||
Reference in new issue
Block a user