diff options
Diffstat (limited to 'sources/pyside6/cmake/PySideHelpers.cmake')
| -rw-r--r-- | sources/pyside6/cmake/PySideHelpers.cmake | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sources/pyside6/cmake/PySideHelpers.cmake b/sources/pyside6/cmake/PySideHelpers.cmake index 0044262cb..23ceda6bd 100644 --- a/sources/pyside6/cmake/PySideHelpers.cmake +++ b/sources/pyside6/cmake/PySideHelpers.cmake @@ -1,3 +1,6 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + function(pyside_internal_detect_if_cross_building) if(CMAKE_CROSSCOMPILING OR QFP_SHIBOKEN_HOST_PATH) set(is_cross_build TRUE) @@ -83,24 +86,30 @@ endmacro() macro(collect_optional_modules) # Collect all optional modules. set(ALL_OPTIONAL_MODULES + DBus Designer Xml Help Multimedia MultimediaWidgets OpenGL OpenGLWidgets + Pdf + PdfWidgets Positioning + Location NetworkAuth Nfc Qml Quick Quick3D QuickControls2 + QuickTest QuickWidgets RemoteObjects Scxml Sensors SerialPort + SerialBus StateMachine TextToSpeech Charts @@ -108,6 +117,7 @@ macro(collect_optional_modules) Svg SvgWidgets DataVisualization + Graphs Bluetooth) find_package(Qt${QT_MAJOR_VERSION}UiTools) if(Qt${QT_MAJOR_VERSION}UiTools_FOUND) @@ -119,18 +129,8 @@ macro(collect_optional_modules) list(APPEND ALL_OPTIONAL_MODULES AxContainer) endif() list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineCore WebEngineWidgets - WebEngineQuick WebSockets) - if(NOT WIN32) - # FIXME: Move to global once DELETE define clash is resolved. - list(APPEND ALL_OPTIONAL_MODULES HttpServer) - list(APPEND ALL_OPTIONAL_MODULES DBus) - endif() - if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 6.0.2) - list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) - endif() - if(WIN32) - list(APPEND ALL_OPTIONAL_MODULES WinExtras) - endif() + WebEngineQuick WebSockets HttpServer) + list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) endmacro() macro(check_os) |