Configure the Release 2 scope in the merged CMakeLists tree
- Lts/CMakeLists.txt: restore the cleanup scope (Tools, DDS, Common, Services, Proxies, Plugins) - the validation version configured only Lts/Common and TrainingAreaBase, silently dropping the GROUP1 DDS targets, the GROUP5 tools and the service libraries. - 11 further scope CMakeLists from cleanup: the validation versions had removed the per-module unit-test subdirectories (ctest baseline targets), LtsUtilsGui, and used a stale GeographicLib link style. - PrtCnv: keep the validation CMAKE_CURRENT_BINARY_DIR include (generated prtcnvlib_export.h). - sPDM executable: guard on Lts/Common/LtsWebSocket (pruned, link orphan) like the sTAB executable.
This commit is contained in:
1 parent
262fd226f9
commit
edd5e3ba81
13 files changed
+118
-27
No files matched your search
@@ -193,6 +193,10 @@ ENDIF()
|
||||
#
|
||||
# --- Executable svcProjectDataManagement (sPDM) -------------------------------------------------
|
||||
#
|
||||
# The executable links LtsWebSocketServer, which was pruned from the
|
||||
# tree (prune commit 7fc6f6664), so the target is only created when the
|
||||
# module is present.
|
||||
IF(EXISTS "${CMAKE_SOURCE_DIR}/Lts/Common/LtsWebSocket")
|
||||
LIST(APPEND SRCS_exe
|
||||
convert_db_to_dds.h
|
||||
dds_handler.cpp
|
||||
@@ -237,6 +241,7 @@ NGL_TARGET_LINK_LIBRARIES(svcProjectDataManagement
|
||||
NGL_INSTALL_TARGET(svcProjectDataManagement)
|
||||
NGL_INSTALL(AAR SV FILES log4cxx_pdm.props DESTINATION bin)
|
||||
NGL_ADD_TARGET_LINK(svcProjectDataManagement sPDM)
|
||||
ENDIF()
|
||||
|
||||
# Uncomment if necessary
|
||||
#ADD_SUBDIRECTORY(UnitTests)
|
||||
|
||||
Reference in new issue
Block a user