Defines MAKE_SVCCORECLIENT_LIB guard for svcCoreClient
This commit is contained in:
1 parent
851cbd5cec
commit
35bfe2be39
1 file changed
+13
@@ -9,6 +9,14 @@ IF(BUILD_RTI)
|
|||||||
INCLUDE(MacroRTIDDSGen)
|
INCLUDE(MacroRTIDDSGen)
|
||||||
INCLUDE(MacroCodeGenIdl)
|
INCLUDE(MacroCodeGenIdl)
|
||||||
|
|
||||||
|
# Resolve <DDS/...> includes (generic_data_reader.h, generic_dtc.h, ...) to the
|
||||||
|
# real headers under Lts/DDS/ instead of the migration stub tree in include/.
|
||||||
|
# The generated core_dtc_impl.h relies on GenericDtc::TopicType, which only the
|
||||||
|
# real DDSGeneric::GenericDataReader base provides — the stub variant lacks it.
|
||||||
|
# Same fix the migrated service CMakeLists (FileManagement/FilterManagement)
|
||||||
|
# already enforce; svcFileManagement links svcCoreClient, so Core must build.
|
||||||
|
include_directories(BEFORE ${CMAKE_SOURCE_DIR}/Lts)
|
||||||
|
|
||||||
SET(xml_FILE core.xml)
|
SET(xml_FILE core.xml)
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -111,6 +119,11 @@ SET(SRCS_client
|
|||||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||||
|
|
||||||
NGL_ADD_LIBRARY2(AAR SV WS HLA svcCoreClient SHARED ${SRCS_client})
|
NGL_ADD_LIBRARY2(AAR SV WS HLA svcCoreClient SHARED ${SRCS_client})
|
||||||
|
# NGL_ADD_LIBRARY2 (unlike NGL_ADD_LIBRARY) does not define the
|
||||||
|
# MAKE_<SYMBOL>_LIB compile guard, but the generated core_[d|f]tc_impl.h
|
||||||
|
# headers require MAKE_SVCCORECLIENT_LIB — same situation as ddscore above,
|
||||||
|
# which defines MAKE_DDSCORE_LIB explicitly for the same reason.
|
||||||
|
TARGET_COMPILE_DEFINITIONS(svcCoreClient PRIVATE MAKE_SVCCORECLIENT_LIB)
|
||||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCoreClient
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcCoreClient
|
||||||
PUBLIC
|
PUBLIC
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
||||||
|
|||||||
Reference in new issue
Block a user