diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/CMakeLists.txt index 0e621a821..a390f5059 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/CMakeLists.txt @@ -8,8 +8,15 @@ # --- Library LtsWebSocketCommon -------------------------------------------------------------------------------- # # Make ${Qt6_WebSockets} optional -if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets) - set(Qt6_WebSockets ${Qt6_WebSockets}) +# Link the real WebSockets module whenever the websocket code path is +# compiled: QT6_WEBSOCKETS_AVAILABLE (root CMakeLists) and the manual +# Qt6::WebSockets import are set when the real module was found. The old +# QT6_GUI_AVAILABLE condition never held in this environment (Qt6 +# discovery takes the minimal path) and the Qt6_WebSockets variable was +# never defined, so the websocket code compiled without the module on +# the link line. +if(QT6_WEBSOCKETS_REAL_FOUND OR Qt6WebSockets_FOUND) + set(Qt6_WebSockets Qt6::WebSockets) else() set(Qt6_WebSockets "") endif()