Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -64,6 +64,16 @@ IF(CMAKE_VERSION VERSION_GREATER 3.15.9)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
# Qt6 Migration: Options to disable modules with missing dependencies (WebEngine, XmlPatterns, ArcGIS)
|
||||
# These can be enabled once the required system dependencies are available in the build environment
|
||||
OPTION(BUILD_PLUGINS_PLANEDITOR "Build PlanEditor plugin (requires Qt6 WebEngine + ArcGIS SDK)" OFF)
|
||||
OPTION(BUILD_PLUGINS_ONLINEHELP "Build OnlineHelp plugin (requires Qt6 WebEngine)" OFF)
|
||||
OPTION(BUILD_PLUGINS_SERVICEMONITOR "Build ServiceMonitor plugin (requires Qt6 WebEngine)" OFF)
|
||||
OPTION(BUILD_PLUGINS_PARTICIPANT_ORG_CHART "Build ParticipantOrgChart (requires Qt6 WebEngine)" OFF)
|
||||
OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (requires Qt6 XmlPatterns)" OFF)
|
||||
OPTION(BUILD_PLUGINS_SAAB "Build Saab module (requires Qt6 XmlPatterns)" OFF)
|
||||
OPTION(BUILD_RTI "Build RTI Connext DDS dependent modules" OFF)
|
||||
|
||||
IF(WIN32)
|
||||
SET(EXTERNAL_LIBRARY_DIR "C:/Development/Projekte/SituationMap/ExtFw" CACHE STRING "Library dir with all external dependencies")
|
||||
LIST(APPEND CMAKE_PREFIX_PATH "${EXTERNAL_LIBRARY_DIR}")
|
||||
@@ -72,6 +82,8 @@ ENDIF()
|
||||
|
||||
ENABLE_TESTING()
|
||||
INCLUDE(CTest)
|
||||
# Add migration tests
|
||||
ADD_SUBDIRECTORY(tests)
|
||||
CONFIGURE_FILE(CTestCustom.ctest ${CMAKE_BINARY_DIR}/CTestCustom.ctest COPYONLY)
|
||||
CONFIGURE_FILE(lts-cc.conf ${CMAKE_BINARY_DIR}/lts-cc.conf.distrib COPYONLY)
|
||||
|
||||
@@ -96,9 +108,9 @@ macro_ensure_out_of_source_build("In-Source build nicht erlaubt!")
|
||||
SET(CMAKE_AUTOMOC TRUE)
|
||||
SET(CMAKE_AUTOUIC TRUE)
|
||||
SET(QT_USE_IMPORTED_TARGETS TRUE)
|
||||
# Prefer Qt6, fallback to Qt5. Create Qt5::*-aliases when Qt6 is found so existing CMakeLists continue to work.
|
||||
# Prefer Qt6, fallback to Qt5. Create Qt6::*-aliases when Qt6 is found so existing CMakeLists continue to work.
|
||||
# Try to detect Qt6 with a minimal check and then create aliases/placeholders for components used across the project.
|
||||
# Prefer Qt6, fallback to Qt5. Create Qt5::* aliases only when the corresponding
|
||||
# Prefer Qt6, fallback to Qt5. Create Qt6::* aliases only when the corresponding
|
||||
# Qt6:: component target exists. Avoid creating IMPORTED placeholder targets which
|
||||
# have no LOCATION and later inject 'NOTFOUND' into autogen timestamp deps.
|
||||
# Find minimal Qt6 Core first, then probe for other components (non-fatal).
|
||||
@@ -109,11 +121,8 @@ if(Qt6_FOUND)
|
||||
Sensors Multimedia Sql Svg SerialPort Test UiTools WebSockets WebEngineCore WebEngineWidgets
|
||||
Widgets Xml XmlPatterns)
|
||||
foreach(_comp ${_qlist})
|
||||
# Probe for each component (non-fatal). If found, create a Qt5:: alias.
|
||||
# Probe for each component (non-fatal).
|
||||
find_package(Qt6 COMPONENTS ${_comp} QUIET)
|
||||
if(TARGET "Qt6::${_comp}")
|
||||
add_library("Qt5::${_comp}" ALIAS "Qt6::${_comp}")
|
||||
endif()
|
||||
endforeach()
|
||||
# Map version variable for compatibility if available
|
||||
if(Qt6Core_VERSION)
|
||||
@@ -127,22 +136,22 @@ if(Qt6_FOUND)
|
||||
find_program(_lrelease_exec lrelease-qt6 lrelease)
|
||||
if(_lrelease_exec)
|
||||
set(Qt5_LRELEASE_EXECUTABLE ${_lrelease_exec} CACHE INTERNAL "Compatibility lrelease executable")
|
||||
if(TARGET Qt6::LinguistTools AND NOT TARGET Qt5::lrelease)
|
||||
add_executable(Qt5::lrelease IMPORTED)
|
||||
set_target_properties(Qt5::lrelease PROPERTIES IMPORTED_LOCATION ${Qt5_LRELEASE_EXECUTABLE})
|
||||
if(TARGET Qt6::LinguistTools AND NOT TARGET Qt6::lrelease)
|
||||
add_executable(Qt6::lrelease IMPORTED)
|
||||
set_target_properties(Qt6::lrelease PROPERTIES IMPORTED_LOCATION ${Qt5_LRELEASE_EXECUTABLE})
|
||||
endif()
|
||||
endif()
|
||||
else()
|
||||
FIND_PACKAGE(Qt5 5.9.0 COMPONENTS Concurrent Core Gui Location LinguistTools
|
||||
find_package(Qt6 5.9.0 COMPONENTS Concurrent Core Gui Location LinguistTools
|
||||
Network OpenGL PrintSupport Sensors Multimedia
|
||||
Sql Svg SerialPort Test UiTools WebSockets
|
||||
WebEngineCore WebEngineWidgets Widgets
|
||||
Xml XmlPatterns
|
||||
REQUIRED)
|
||||
MESSAGE(STATUS "Qt version is ${Qt5Core_VERSION}")
|
||||
MESSAGE(STATUS "Qt version is ${Qt6Core_VERSION}")
|
||||
endif()
|
||||
|
||||
MESSAGE(STATUS "Qt version is ${Qt5Core_VERSION}")
|
||||
MESSAGE(STATUS "Qt version is ${Qt6Core_VERSION}")
|
||||
ADD_DEFINITIONS(-DQT_USE_QSTRINGBUILDER)
|
||||
ADD_DEFINITIONS(-DQT_NO_CAST_TO_ASCII)
|
||||
ADD_DEFINITIONS(-DQT_NO_CAST_FROM_ASCII)
|
||||
@@ -290,6 +299,15 @@ ENDIF(USE_UBSAN)
|
||||
|
||||
OPTION(BUILD_RPM "Build a RPM - install script in scripts subdir" OFF)
|
||||
|
||||
# Build component options for NGL_ADD_LIBRARY
|
||||
OPTION(BUILD_ALL "Build all components" ON)
|
||||
OPTION(BUILD_SV "Build SV component" ON)
|
||||
OPTION(BUILD_WS "Build WS component" ON)
|
||||
OPTION(BUILD_AAR "Build AAR component" ON)
|
||||
OPTION(BUILD_TOOLSWS "Build TOOLSWS component" ON)
|
||||
OPTION(BUILD_TOOLSSV "Build TOOLSSV component" ON)
|
||||
OPTION(BUILD_HLA "Build HLA component" ON)
|
||||
|
||||
IF(BUILD_RPM)
|
||||
ADD_SUBDIRECTORY(scripts)
|
||||
ELSE()
|
||||
@@ -359,13 +377,12 @@ endfunction()
|
||||
NGL_ADD_SUBDIR_GUARDED(TetraIF)
|
||||
NGL_ADD_SUBDIR_GUARDED(Z/src)
|
||||
NGL_ADD_SUBDIR_GUARDED(Lts)
|
||||
# Special-case: when migrating TetraIF, also include TrainingAreaBase and Z so generated headers
|
||||
# TrainingAreaBase is included via Lts/Proxies when Lts is processed
|
||||
# Special-case: when migrating TetraIF, also include ProjectDataManagement so generated headers
|
||||
# and internal logger target are available in the same build tree for TetraIF dependents.
|
||||
if(DEFINED MIGRATE_MODULE AND MIGRATE_MODULE STREQUAL "TetraIF")
|
||||
message(STATUS "Including helper modules for TetraIF migration: Lts/Proxies/TrainingAreaBase and Z/src")
|
||||
add_subdirectory(Lts/Proxies/TrainingAreaBase)
|
||||
message(STATUS "Including helper modules for TetraIF migration: Lts/Plugins/ProjectDataManagement")
|
||||
add_subdirectory(Lts/Plugins/ProjectDataManagement)
|
||||
add_subdirectory(Z/src)
|
||||
endif()
|
||||
# at last, to make sure we get all targets in NGL_TS_TARGETS property
|
||||
NGL_ADD_SUBDIR_GUARDED(translations)
|
||||
|
||||
Reference in new issue
Block a user