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>
72 lines
2.7 KiB
CMake
72 lines
2.7 KiB
CMake
cmake_minimum_required(VERSION 3.16...3.21)
|
|
|
|
# These are part of the public API. Projects should use them to provide a
|
|
# consistent set of prefix-relative destinations.
|
|
if(NOT QT_DEPLOY_BIN_DIR)
|
|
set(QT_DEPLOY_BIN_DIR "bin")
|
|
endif()
|
|
if(NOT QT_DEPLOY_LIBEXEC_DIR)
|
|
set(QT_DEPLOY_LIBEXEC_DIR "libexec")
|
|
endif()
|
|
if(NOT QT_DEPLOY_LIB_DIR)
|
|
set(QT_DEPLOY_LIB_DIR "lib")
|
|
endif()
|
|
if(NOT QT_DEPLOY_PLUGINS_DIR)
|
|
set(QT_DEPLOY_PLUGINS_DIR "lib/x86_64-linux-gnu/qt6/plugins")
|
|
endif()
|
|
if(NOT QT_DEPLOY_QML_DIR)
|
|
set(QT_DEPLOY_QML_DIR "lib/x86_64-linux-gnu/qt6/qml")
|
|
endif()
|
|
if(NOT QT_DEPLOY_TRANSLATIONS_DIR)
|
|
set(QT_DEPLOY_TRANSLATIONS_DIR "share/qt6/translations")
|
|
endif()
|
|
if(NOT QT_DEPLOY_PREFIX)
|
|
set(QT_DEPLOY_PREFIX "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}")
|
|
endif()
|
|
if(QT_DEPLOY_PREFIX STREQUAL "")
|
|
set(QT_DEPLOY_PREFIX .)
|
|
endif()
|
|
if(NOT QT_DEPLOY_IGNORED_LIB_DIRS)
|
|
set(QT_DEPLOY_IGNORED_LIB_DIRS "/lib/x86_64-linux-gnu;/lib")
|
|
endif()
|
|
|
|
# These are internal implementation details. They may be removed at any time.
|
|
set(__QT_DEPLOY_SYSTEM_NAME "Linux")
|
|
set(__QT_DEPLOY_SHARED_LIBRARY_SUFFIX ".so")
|
|
set(__QT_DEPLOY_IS_SHARED_LIBS_BUILD "ON")
|
|
set(__QT_DEPLOY_TOOL "GRD")
|
|
set(__QT_DEPLOY_IMPL_DIR "/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/.qt")
|
|
set(__QT_DEPLOY_VERBOSE "")
|
|
set(__QT_CMAKE_EXPORT_NAMESPACE "Qt6")
|
|
set(__QT_LIBINFIX "")
|
|
set(__QT_DEPLOY_GENERATOR_IS_MULTI_CONFIG "0")
|
|
set(__QT_DEPLOY_ACTIVE_CONFIG "Debug")
|
|
set(__QT_NO_CREATE_VERSIONLESS_FUNCTIONS "")
|
|
set(__QT_DEFAULT_MAJOR_VERSION "6")
|
|
set(__QT_DEPLOY_QT_ADDITIONAL_PACKAGES_PREFIX_PATH "")
|
|
set(__QT_DEPLOY_QT_INSTALL_PREFIX "/usr")
|
|
set(__QT_DEPLOY_QT_INSTALL_BINS "lib/qt6/bin")
|
|
set(__QT_DEPLOY_QT_INSTALL_DATA "share/qt6")
|
|
set(__QT_DEPLOY_QT_INSTALL_DESCRIPTIONSDIR "lib/x86_64-linux-gnu/qt6/modules")
|
|
set(__QT_DEPLOY_QT_INSTALL_LIBEXECS "lib/qt6/libexec")
|
|
set(__QT_DEPLOY_QT_INSTALL_PLUGINS "lib/x86_64-linux-gnu/qt6/plugins")
|
|
set(__QT_DEPLOY_QT_INSTALL_TRANSLATIONS "share/qt6/translations")
|
|
set(__QT_DEPLOY_TARGET_QT_PATHS_PATH "/usr/lib/qt6/bin/qtpaths6")
|
|
set(__QT_DEPLOY_MUST_ADJUST_PLUGINS_RPATH "ON")
|
|
set(__QT_DEPLOY_USE_PATCHELF "")
|
|
set(__QT_DEPLOY_PATCHELF_EXECUTABLE "")
|
|
set(__QT_DEPLOY_QT_IS_MULTI_CONFIG_BUILD_WITH_DEBUG "FALSE")
|
|
set(__QT_DEPLOY_QT_DEBUG_POSTFIX "")
|
|
|
|
# Define the CMake commands to be made available during deployment.
|
|
set(__qt_deploy_support_files
|
|
"/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build4/.qt/QtDeployTargets.cmake"
|
|
"/usr/lib/x86_64-linux-gnu/cmake/Qt6Core/Qt6CoreDeploySupport.cmake"
|
|
)
|
|
foreach(__qt_deploy_support_file IN LISTS __qt_deploy_support_files)
|
|
include("${__qt_deploy_support_file}")
|
|
endforeach()
|
|
|
|
unset(__qt_deploy_support_file)
|
|
unset(__qt_deploy_support_files)
|