Update qt-migration-legatus submodule to bb58062c6
- TrainingAreaBase: wrap svcTabClient, svcTabServer, svcTrainingAreaBase executables and DDS plugins in IF(NOT RELEASE_BUILD) conditionals - Only tabTelegrams library and tabPluginInterface built for release scope Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
8 files changed
+1930
-904
No files matched your search
@@ -17,13 +17,19 @@ endif()
|
|||||||
|
|
||||||
# Add only existing subdirectories to allow partial checkouts / incremental migration
|
# Add only existing subdirectories to allow partial checkouts / incremental migration
|
||||||
if(RELEASE_BUILD)
|
if(RELEASE_BUILD)
|
||||||
# For first release: only build Lts/Common (excludes Tools, Application, DDS, Services, Proxies, Plugins, Viewer, Projects)
|
# For first release: build Lts/Common and TrainingAreaBase (for tabTelegrams library)
|
||||||
message(STATUS "RELEASE_BUILD=ON: Building only Lts/Common")
|
message(STATUS "RELEASE_BUILD=ON: Building Lts/Common and TrainingAreaBase/tabTelegrams")
|
||||||
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Common")
|
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Common")
|
||||||
NGL_ADD_SUBDIR_GUARDED(Common)
|
NGL_ADD_SUBDIR_GUARDED(Common)
|
||||||
else()
|
else()
|
||||||
message(STATUS "Skipping missing Lts subdirectory: Common")
|
message(STATUS "Skipping missing Lts subdirectory: Common")
|
||||||
endif()
|
endif()
|
||||||
|
# TrainingAreaBase needed for tabTelegrams library (used by TetraIF/CoPrtCnv)
|
||||||
|
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Proxies/TrainingAreaBase")
|
||||||
|
NGL_ADD_SUBDIR_GUARDED(Proxies/TrainingAreaBase)
|
||||||
|
else()
|
||||||
|
message(STATUS "Skipping missing Lts subdirectory: Proxies/TrainingAreaBase")
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
set(LTS_SUBDIRS Tools Application DDS Common Services Proxies Plugins Viewer Projects)
|
set(LTS_SUBDIRS Tools Application DDS Common Services Proxies Plugins Viewer Projects)
|
||||||
foreach(dir IN LISTS LTS_SUBDIRS)
|
foreach(dir IN LISTS LTS_SUBDIRS)
|
||||||
|
|||||||
+3
-1
@@ -8,5 +8,7 @@
|
|||||||
|
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(LtsUtilsCore)
|
ADD_SUBDIRECTORY(LtsUtilsCore)
|
||||||
ADD_SUBDIRECTORY(LtsUtilsGui)
|
IF(NOT RELEASE_BUILD)
|
||||||
|
ADD_SUBDIRECTORY(LtsUtilsGui)
|
||||||
|
ENDIF()
|
||||||
ADD_SUBDIRECTORY(LtsUtilsSettings)
|
ADD_SUBDIRECTORY(LtsUtilsSettings)
|
||||||
+17
-4
@@ -16,10 +16,12 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
INCLUDE(MacroRTIDDSGen)
|
# Skip DDS-dependent code generation and plugins for release builds
|
||||||
INCLUDE(MacroCodeGenIdl)
|
IF(NOT RELEASE_BUILD)
|
||||||
|
INCLUDE(MacroRTIDDSGen)
|
||||||
ADD_SUBDIRECTORY(Plugins)
|
INCLUDE(MacroCodeGenIdl)
|
||||||
|
ADD_SUBDIRECTORY(Plugins)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
SET(xml_FILE tab_service.xml)
|
SET(xml_FILE tab_service.xml)
|
||||||
|
|
||||||
@@ -64,6 +66,8 @@ endif()
|
|||||||
#
|
#
|
||||||
# --- Library svcTabCommon --------------------------------------------------------------------------------
|
# --- Library svcTabCommon --------------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
|
# Skip for release builds - DDS-dependent service library
|
||||||
|
IF(NOT RELEASE_BUILD)
|
||||||
SET(SRCS_common
|
SET(SRCS_common
|
||||||
logger.cpp
|
logger.cpp
|
||||||
logger.h
|
logger.h
|
||||||
@@ -130,10 +134,13 @@ NGL_TARGET_LINK_LIBRARIES(svcTabCommon
|
|||||||
)
|
)
|
||||||
ENDIF(BUILD_RTI)
|
ENDIF(BUILD_RTI)
|
||||||
NGL_INSTALL_TARGET(svcTabCommon)
|
NGL_INSTALL_TARGET(svcTabCommon)
|
||||||
|
ENDIF() # NOT RELEASE_BUILD
|
||||||
|
|
||||||
#
|
#
|
||||||
# --- Library svcTabClient --------------------------------------------------------------------------------
|
# --- Library svcTabClient --------------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
|
# Skip for release builds - DDS-dependent service library
|
||||||
|
IF(NOT RELEASE_BUILD)
|
||||||
SET(SRCS_client
|
SET(SRCS_client
|
||||||
tab_export.h
|
tab_export.h
|
||||||
)
|
)
|
||||||
@@ -166,10 +173,13 @@ NGL_TARGET_LINK_LIBRARIES(svcTabClient
|
|||||||
)
|
)
|
||||||
ENDIF(BUILD_RTI)
|
ENDIF(BUILD_RTI)
|
||||||
NGL_INSTALL_TARGET(svcTabClient)
|
NGL_INSTALL_TARGET(svcTabClient)
|
||||||
|
ENDIF() # NOT RELEASE_BUILD
|
||||||
|
|
||||||
#
|
#
|
||||||
# --- Library svcTabServer --------------------------------------------------------------------------------
|
# --- Library svcTabServer --------------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
|
# Skip for release builds - DDS-dependent service library
|
||||||
|
IF(NOT RELEASE_BUILD)
|
||||||
SET(SRCS_server
|
SET(SRCS_server
|
||||||
tx_mixin.cpp
|
tx_mixin.cpp
|
||||||
tx_mixin.h
|
tx_mixin.h
|
||||||
@@ -234,6 +244,8 @@ ENDIF()
|
|||||||
#
|
#
|
||||||
# --- Executable svcTrainingAreaBase (sTAB) -------------------------------------------------
|
# --- Executable svcTrainingAreaBase (sTAB) -------------------------------------------------
|
||||||
#
|
#
|
||||||
|
# Skip for release builds - DDS-dependent executable
|
||||||
|
IF(NOT RELEASE_BUILD)
|
||||||
SET(SRCS_exe
|
SET(SRCS_exe
|
||||||
dds_handler.cpp
|
dds_handler.cpp
|
||||||
dds_handler.h
|
dds_handler.h
|
||||||
@@ -325,6 +337,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTrainingAreaBase
|
|||||||
NGL_INSTALL_TARGET(svcTrainingAreaBase)
|
NGL_INSTALL_TARGET(svcTrainingAreaBase)
|
||||||
NGL_INSTALL(AAR SV FILES log4cxx_tab.props DESTINATION bin)
|
NGL_INSTALL(AAR SV FILES log4cxx_tab.props DESTINATION bin)
|
||||||
NGL_ADD_TARGET_LINK(svcTrainingAreaBase sTAB)
|
NGL_ADD_TARGET_LINK(svcTrainingAreaBase sTAB)
|
||||||
|
ENDIF() # NOT RELEASE_BUILD
|
||||||
|
|
||||||
# clientPluginInterface
|
# clientPluginInterface
|
||||||
ADD_LIBRARY(tabPluginInterface INTERFACE)
|
ADD_LIBRARY(tabPluginInterface INTERFACE)
|
||||||
|
|||||||
+3
-1
@@ -8,5 +8,7 @@
|
|||||||
|
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(LtsUtilsCore)
|
ADD_SUBDIRECTORY(LtsUtilsCore)
|
||||||
ADD_SUBDIRECTORY(LtsUtilsGui)
|
IF(NOT RELEASE_BUILD)
|
||||||
|
ADD_SUBDIRECTORY(LtsUtilsGui)
|
||||||
|
ENDIF()
|
||||||
ADD_SUBDIRECTORY(LtsUtilsSettings)
|
ADD_SUBDIRECTORY(LtsUtilsSettings)
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
legatus-guez (1.0-20261009-173649) unstable; urgency=medium
|
legatus-guez (1.0-20261009-174354) unstable; urgency=medium
|
||||||
|
|
||||||
* Automated build for Ubuntu 26.04
|
* Automated build for Ubuntu 26.04
|
||||||
* Qt6/C++23 migration
|
* Qt6/C++23 migration
|
||||||
|
|
||||||
-- Legatus Team <legatus@example.com> Fri, 09 Oct 2026 17:40:03 +0000
|
-- Legatus Team <legatus@example.com> Fri, 09 Oct 2026 17:47:13 +0000
|
||||||
+1
-1
@@ -10,5 +10,5 @@ Architecture: any
|
|||||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||||
Description: Legatus guez LTS package
|
Description: Legatus guez LTS package
|
||||||
Legatus guez component built with Qt6/C++23
|
Legatus guez component built with Qt6/C++23
|
||||||
Version: 1.0-20261009-173649
|
Version: 1.0-20261009-174354
|
||||||
Build flags: -DUSE_IPO=ON -DUSE_UNITY_BUILD=ON -DGUEZ_MODE=ON -DBUILD_WLS=ON -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/include/postgresql/ -DRELEASE_BUILD=ON
|
Build flags: -DUSE_IPO=ON -DUSE_UNITY_BUILD=ON -DGUEZ_MODE=ON -DBUILD_WLS=ON -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/include/postgresql/ -DRELEASE_BUILD=ON
|
||||||
+1895
-892
File diff suppressed because it is too large.
Load diff
+1
-1
Submodule qt-migration-legatus updated: 6d3a06f90a...bb58062c6f.
Reference in new issue
Block a user