Reworks CMake wiring for Qt6 codegen include order

Adds missing toolchain packages and include dirs so generated headers resolve.
This commit is contained in:
berrux-dev committed 2026-09-21 02:42:27 +02:00
1 parent 220ca64679
commit cf62b17d58
25 files changed
+388 -84

No files matched your search

@@ -6,7 +6,7 @@
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
set(Qt6_Gui Qt6::Gui)
else()
set(Qt6_Gui "")
endif()
@@ -42,12 +42,6 @@ CODEGEN_DATABASE(SRCS_common ${xml_FILE})
# Generate *.cpp/*.hpp from idl
RTIDDSGEN(SRCS_common bld_enums.idl)
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/Buildings/bld_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Proxies/Buildings/bld_enums.hpp
COPYONLY
)
RTIDDSGEN(SRCS_common bld.idl)
# Generate bld_dt[s,c]_types.h, bld_ft[s,c]_types.h
@@ -85,6 +79,11 @@ SET(SRCS_client
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV WS svcBldClient SHARED ${SRCS_client})
# NGL_ADD_LIBRARY2 (unlike NGL_ADD_LIBRARY) does not define the
# MAKE_<SYMBOL>_LIB compile guard, but the generated bld_[d|f]tc_impl.h
# headers that this target compiles carry such a guard — same situation as
# ddscore, which defines MAKE_DDSCORE_LIB explicitly for the same reason.
TARGET_COMPILE_DEFINITIONS(svcBldClient PRIVATE MAKE_SVCBLDCLIENT_LIB)
NGL_TARGET_INCLUDE_DIRECTORIES(svcBldClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -113,6 +112,9 @@ SET(SRCS_server
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV svcBldServer SHARED ${SRCS_server})
# Same guard rationale as svcBldClient above: the generated
# bld_[d|f]ts_impl.h headers require MAKE_SVCBLDSERVER_LIB.
TARGET_COMPILE_DEFINITIONS(svcBldServer PRIVATE MAKE_SVCBLDSERVER_LIB)
NGL_TARGET_INCLUDE_DIRECTORIES(svcBldServer
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -61,6 +61,11 @@ SET(SRCS_client
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY2(SV WS svcCmoClient SHARED ${SRCS_client})
# NGL_ADD_LIBRARY2 (unlike NGL_ADD_LIBRARY) does not define the
# MAKE_<SYMBOL>_LIB compile guard, but the generated cmo_[d|f]tc_impl.h
# headers that this target compiles carry such a guard — same situation as
# ddscore, which defines MAKE_DDSCORE_LIB explicitly for the same reason.
TARGET_COMPILE_DEFINITIONS(svcCmoClient PRIVATE MAKE_SVCCMOCLIENT_LIB)
NGL_TARGET_INCLUDE_DIRECTORIES(svcCmoClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -90,6 +95,9 @@ SET(SRCS_server
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
NGL_ADD_LIBRARY2(SV svcCmoServer SHARED ${SRCS_server})
# Same guard rationale as svcCmoClient above: the generated
# cmo_[d|f]ts_impl.h headers require MAKE_SVCCMOSERVER_LIB.
TARGET_COMPILE_DEFINITIONS(svcCmoServer PRIVATE MAKE_SVCCMOSERVER_LIB)
NGL_TARGET_INCLUDE_DIRECTORIES(svcCmoServer
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -66,6 +66,11 @@ SET(SRCS_client
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV WS svcGnaClient SHARED ${SRCS_client})
# NGL_ADD_LIBRARY2 (unlike NGL_ADD_LIBRARY) does not define the
# MAKE_<SYMBOL>_LIB compile guard, but the generated gna_[d|f]tc_impl.h
# headers that this target compiles carry such a guard — same situation as
# ddscore, which defines MAKE_DDSCORE_LIB explicitly for the same reason.
TARGET_COMPILE_DEFINITIONS(svcGnaClient PRIVATE MAKE_SVCGNACLIENT_LIB)
NGL_TARGET_INCLUDE_DIRECTORIES(svcGnaClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -152,6 +152,11 @@ IF(BUILD_RTI)
ENDIF()
NGL_ADD_LIBRARY2(AAR SV WS HLA svcTabClient SHARED ${SRCS_client})
# NGL_ADD_LIBRARY2 (unlike NGL_ADD_LIBRARY) does not define the
# MAKE_<SYMBOL>_LIB compile guard, but the generated tab_[d|f]tc_impl.h
# headers require MAKE_SVCTABCLIENT_LIB — same situation as
# svcCoreClient/ddscore, which define their guards explicitly.
TARGET_COMPILE_DEFINITIONS(svcTabClient PRIVATE MAKE_SVCTABCLIENT_LIB)
NGL_TARGET_INCLUDE_DIRECTORIES(svcTabClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -184,6 +189,8 @@ IF(BUILD_RTI)
ENDIF()
NGL_ADD_LIBRARY2(AAR HLA SV svcTabServer SHARED ${SRCS_server}) # NGL_ADD_LIBRARY2 won't work here - no time for investigations
# Generated tab_[d|f]ts_impl.h require MAKE_SVCTABSERVER_LIB (see svcTabClient above).
TARGET_COMPILE_DEFINITIONS(svcTabServer PRIVATE MAKE_SVCTABSERVER_LIB)
if(BUILD_SV OR BUILD_HLA)
GENERATE_EXPORT_HEADER(svcTabServer) # FIXME: quick workaround
endif()
@@ -72,6 +72,11 @@ SET(SRCS_client
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV WS svcTabocClient SHARED ${SRCS_client})
# NGL_ADD_LIBRARY2 (unlike NGL_ADD_LIBRARY) does not define the
# MAKE_<SYMBOL>_LIB compile guard, but the generated taboc_[d|f]tc_impl.h
# headers require MAKE_SVCTABOCCLIENT_LIB — same situation as
# svcTabClient/svcCoreClient, which define their guards explicitly.
TARGET_COMPILE_DEFINITIONS(svcTabocClient PRIVATE MAKE_SVCTABOCCLIENT_LIB)
NGL_TARGET_INCLUDE_DIRECTORIES(svcTabocClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -102,6 +107,8 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
#CODEGEN_DATABASE(SRCS_server ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV svcTabocServer SHARED ${SRCS_server})
# Generated taboc_[d|f]ts_impl.h require MAKE_SVCTABOCSERVER_LIB (see svcTabocClient above).
TARGET_COMPILE_DEFINITIONS(svcTabocServer PRIVATE MAKE_SVCTABOCSERVER_LIB)
NGL_TARGET_INCLUDE_DIRECTORIES(svcTabocServer
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../