torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
54 lines
1.2 KiB
CMake
54 lines
1.2 KiB
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
SET(LOG4CXX_PROPS_FILE log4cxx_opapp.props)
|
|
|
|
SET(mwt_SRCS
|
|
main.cpp
|
|
${LOG4CXX_PROPS_FILE}
|
|
)
|
|
|
|
IF(WIN32)
|
|
SET(JBN ${JENKINS_BUILD_NUMBER})
|
|
IF (NOT JENKINS_BUILD_NUMBER)
|
|
SET(JBN "0")
|
|
ENDIF()
|
|
SET(OPAPP_VERSION_INFO "${LTS_VERSION_MAJOR}, ${LTS_VERSION_MINOR}, ${JBN}, ${LTS_VERSION_PATCH}")
|
|
CONFIGURE_FILE(opapp.rc.cmake ${CMAKE_CURRENT_BINARY_DIR}/opapp.rc)
|
|
LIST(APPEND mwt_SRCS ${CMAKE_CURRENT_BINARY_DIR}/opapp.rc)
|
|
ENDIF()
|
|
NGL_ADD_APP_ICON(mwt_SRCS)
|
|
|
|
IF(BUILD_RPM)
|
|
NGL_ADD_EXECUTABLE(WS OperatorApplication WIN32 ${mwt_SRCS})
|
|
ELSE()
|
|
NGL_ADD_EXECUTABLE(WS OperatorApplication ${mwt_SRCS})
|
|
ENDIF()
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(OperatorApplication
|
|
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
|
|
Qt5::Widgets
|
|
Qt5::Network
|
|
nglapplication
|
|
LtsCommandLineParser
|
|
NGLLogger
|
|
LtsSession
|
|
LtsPluginLoader
|
|
LtsAppDescriptor
|
|
LtsAppManager
|
|
LtsSessionData
|
|
LtsUtilsSettings
|
|
ngltranslator
|
|
nglsettings
|
|
LtsProjectionWorkstation
|
|
LtsMultiMonitor # TODO: rm if -m is out
|
|
LtsUtilsGuiConnectDialog # to set timeout if -v is set
|
|
LtsUtilsGuiStyleManager
|
|
)
|
|
NGL_INSTALL_TARGET(OperatorApplication)
|
|
|
|
NGL_INSTALL(FILES WS ${LOG4CXX_PROPS_FILE} DESTINATION "bin")
|