Close ppm.msdl/ppm.saab floors: re-implement MSDL/SAAB import without Qt XmlPatterns
Qt6::Xml (QDomDocument) + xmllint schema check; MSDL links XercesC + xsdc++ tree classes; both moved into GROUP12
This commit is contained in:
18 files changed
+179
-248
No files matched your search
@@ -210,8 +210,12 @@ OPTION(BUILD_PLUGINS_PLANEDITOR "Build PlanEditor plugin (requires Qt6 WebEngine
|
||||
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)
|
||||
# MSDL/Saab no longer require Qt XmlPatterns (removed in Qt 6.0): their import
|
||||
# code was re-implemented with Qt6::Xml (QDomDocument) for the schema check plus
|
||||
# the external xmllint step for real XSD validation; MSDL additionally links
|
||||
# XercesC + uses xsdc++-generated tree classes (needs libxerces-c-dev + xsdcxx).
|
||||
OPTION(BUILD_PLUGINS_MSDL "Build MSDL module (needs XercesC + xsdc++)" OFF)
|
||||
OPTION(BUILD_PLUGINS_SAAB "Build Saab module (Qt6::Xml only)" OFF)
|
||||
OPTION(BUILD_RTI "Build RTI Connext DDS dependent modules" OFF)
|
||||
OPTION(BUILD_VIEWER_ONLY "Build only Viewer module (no RTI required)" OFF)
|
||||
# Add Lts/ include path globally for QosProfile and other Lts headers
|
||||
@@ -360,22 +364,12 @@ if(NOT Qt6_FOUND)
|
||||
message(STATUS "Found Qt6 (minimal): ${Qt6Core_VERSION}")
|
||||
endif()
|
||||
|
||||
# Qt6::XmlPatterns (consumed by the MSDL/Saab import libs, gated by
|
||||
# BUILD_PLUGINS_MSDL / BUILD_PLUGINS_SAAB): the XmlPatterns module (its own
|
||||
# qtxmlpatterns repo) was removed in Qt 6.0 and never re-introduced, so no Qt 6
|
||||
# install carries it. It is NOT part of the component lists above (a missing
|
||||
# component there would flip Qt6_FOUND off and disable the whole GUI path).
|
||||
# Find it separately; when absent the two plugins must stay disabled - their
|
||||
# CMakeLists reference Qt6::XmlPatterns in link libraries and CMake errors at
|
||||
# generate time for an undefined namespaced target.
|
||||
if(NOT TARGET Qt6::XmlPatterns)
|
||||
find_package(Qt6XmlPatterns QUIET)
|
||||
if(Qt6XmlPatterns_FOUND)
|
||||
message(STATUS "Found Qt6XmlPatterns")
|
||||
else()
|
||||
message(STATUS "Qt6XmlPatterns not found (PpmMSDLGuiPlugin/PpmSAABGuiPlugin require it; keep BUILD_PLUGINS_MSDL/BUILD_PLUGINS_SAAB OFF)")
|
||||
endif()
|
||||
endif()
|
||||
# MSDL/Saab import libs (gated by BUILD_PLUGINS_MSDL / BUILD_PLUGINS_SAAB) no
|
||||
# longer use Qt XmlPatterns (QXmlSchema/QXmlSchemaValidator), which was removed
|
||||
# in Qt 6.0. They were re-implemented with Qt6::Xml (QDomDocument) for the
|
||||
# schema well-formedness check plus the external xmllint step for real XSD
|
||||
# validation; MSDL additionally links XercesC and uses xsdc++-generated tree
|
||||
# classes. No Qt6::XmlPatterns lookup is needed any more.
|
||||
|
||||
# Qt6::WebChannel (consumed by PpmOrgChartGuiPlugin's QWebChannel page setup):
|
||||
# in Qt5 Qt5::WebEngineWidgets transitively linked Qt5::WebChannel (Qt5's
|
||||
|
||||
Reference in new issue
Block a user