diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-11-28 14:57:31 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-12-07 12:41:39 +0000 |
| commit | 4d82ee992992251bcadf0097a4df60fe7c3b7ef8 (patch) | |
| tree | e1289f18413679c2def060821980c93452cecf26 | |
| parent | 69755075484b75f2e7b97663b9135be90be6140b (diff) | |
Make it hard to use the create_pyside_module function incorrectly
Rewrite the function to use keyword arguments instead of ordered
arguments. Also add error detection when required arguments are not
passed, or have a typo in them.
Adjust all the module cmake files to use keyword arguments.
Change-Id: I7bb0c6561d7dca1e7f673e29eb457da50ae5df04
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
46 files changed, 376 insertions, 400 deletions
diff --git a/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt index 9bdf36add..258a011bf 100644 --- a/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt @@ -45,11 +45,10 @@ set(Qt3DAnimation_libraries pyside2 set(Qt3DAnimation_deps Qt3DRender) -create_pyside_module(Qt3DAnimation - Qt3DAnimation_include_dirs - Qt3DAnimation_libraries - Qt3DAnimation_deps - Qt3DAnimation_SOURCE_DIR - Qt3DAnimation_SRC - "" - ${Qt3DAnimation_BINARY_DIR}/typesystem_3danimation.xml) +create_pyside_module(NAME Qt3DAnimation + INCLUDE_DIRS Qt3DAnimation_include_dirs + LIBRARIES Qt3DAnimation_libraries + DEPS Qt3DAnimation_deps + TYPESYSTEM_PATH Qt3DAnimation_SOURCE_DIR + SOURCES Qt3DAnimation_SRC + TYPESYSTEM_NAME ${Qt3DAnimation_BINARY_DIR}/typesystem_3danimation.xml) diff --git a/sources/pyside2/PySide2/Qt3DCore/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DCore/CMakeLists.txt index 53d3cc634..d046f8fc1 100644 --- a/sources/pyside2/PySide2/Qt3DCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DCore/CMakeLists.txt @@ -64,11 +64,10 @@ set(Qt3DCore_libraries pyside2 set(Qt3DCore_deps QtGui QtNetwork) -create_pyside_module(Qt3DCore - Qt3DCore_include_dirs - Qt3DCore_libraries - Qt3DCore_deps - Qt3DCore_SOURCE_DIR - Qt3DCore_SRC - "" - ${Qt3DCore_BINARY_DIR}/typesystem_3dcore.xml) +create_pyside_module(NAME Qt3DCore + INCLUDE_DIRS Qt3DCore_include_dirs + LIBRARIES Qt3DCore_libraries + DEPS Qt3DCore_deps + TYPESYSTEM_PATH Qt3DCore_SOURCE_DIR + SOURCES Qt3DCore_SRC + TYPESYSTEM_NAME ${Qt3DCore_BINARY_DIR}/typesystem_3dcore.xml) diff --git a/sources/pyside2/PySide2/Qt3DExtras/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DExtras/CMakeLists.txt index 4bc25d52d..bd750949d 100644 --- a/sources/pyside2/PySide2/Qt3DExtras/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DExtras/CMakeLists.txt @@ -71,11 +71,10 @@ set(Qt3DExtras_libraries pyside2 set(Qt3DExtras_deps Qt3DRender) -create_pyside_module(Qt3DExtras - Qt3DExtras_include_dirs - Qt3DExtras_libraries - Qt3DExtras_deps - Qt3DExtras_SOURCE_DIR - Qt3DExtras_SRC - "" - ${Qt3DExtras_BINARY_DIR}/typesystem_3dextras.xml) +create_pyside_module(NAME Qt3DExtras + INCLUDE_DIRS Qt3DExtras_include_dirs + LIBRARIES Qt3DExtras_libraries + DEPS Qt3DExtras_deps + TYPESYSTEM_PATH Qt3DExtras_SOURCE_DIR + SOURCES Qt3DExtras_SRC + TYPESYSTEM_NAME ${Qt3DExtras_BINARY_DIR}/typesystem_3dextras.xml) diff --git a/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt index 694f373f8..a3366c9ba 100644 --- a/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt @@ -46,11 +46,10 @@ set(Qt3DInput_libraries pyside2 set(Qt3DInput_deps Qt3DCore) -create_pyside_module(Qt3DInput - Qt3DInput_include_dirs - Qt3DInput_libraries - Qt3DInput_deps - Qt3DInput_SOURCE_DIR - Qt3DInput_SRC - "" - ${Qt3DInput_BINARY_DIR}/typesystem_3dinput.xml) +create_pyside_module(NAME Qt3DInput + INCLUDE_DIRS Qt3DInput_include_dirs + LIBRARIES Qt3DInput_libraries + DEPS Qt3DInput_deps + TYPESYSTEM_PATH Qt3DInput_SOURCE_DIR + SOURCES Qt3DInput_SRC + TYPESYSTEM_NAME ${Qt3DInput_BINARY_DIR}/typesystem_3dinput.xml) diff --git a/sources/pyside2/PySide2/Qt3DLogic/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DLogic/CMakeLists.txt index 23cde8804..8cf4de37f 100644 --- a/sources/pyside2/PySide2/Qt3DLogic/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DLogic/CMakeLists.txt @@ -27,11 +27,10 @@ set(Qt3DLogic_libraries pyside2 set(Qt3DLogic_deps Qt3DCore) -create_pyside_module(Qt3DLogic - Qt3DLogic_include_dirs - Qt3DLogic_libraries - Qt3DLogic_deps - Qt3DLogic_SOURCE_DIR - Qt3DLogic_SRC - "" - ${Qt3DLogic_BINARY_DIR}/typesystem_3dlogic.xml) +create_pyside_module(NAME Qt3DLogic + INCLUDE_DIRS Qt3DLogic_include_dirs + LIBRARIES Qt3DLogic_libraries + DEPS Qt3DLogic_deps + TYPESYSTEM_PATH Qt3DLogic_SOURCE_DIR + SOURCES Qt3DLogic_SRC + TYPESYSTEM_NAME ${Qt3DLogic_BINARY_DIR}/typesystem_3dlogic.xml) diff --git a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt index 1b859ca1e..011536cef 100644 --- a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt @@ -145,11 +145,10 @@ set(Qt3DRender_libraries pyside2 set(Qt3DRender_deps Qt3DCore) -create_pyside_module(Qt3DRender - Qt3DRender_include_dirs - Qt3DRender_libraries - Qt3DRender_deps - Qt3DRender_SOURCE_DIR - Qt3DRender_SRC - "" - ${Qt3DRender_BINARY_DIR}/typesystem_3drender.xml) +create_pyside_module(NAME Qt3DRender + INCLUDE_DIRS Qt3DRender_include_dirs + LIBRARIES Qt3DRender_libraries + DEPS Qt3DRender_deps + TYPESYSTEM_PATH Qt3DRender_SOURCE_DIR + SOURCES Qt3DRender_SRC + TYPESYSTEM_NAME ${Qt3DRender_BINARY_DIR}/typesystem_3drender.xml) diff --git a/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt b/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt index a3971786b..6e9492d48 100644 --- a/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt @@ -36,11 +36,10 @@ set(QtAxContainer_libraries pyside2 set(QtAxContainer_deps QtWidgets) -create_pyside_module(QtAxContainer - QtAxContainer_include_dirs - QtAxContainer_libraries - QtAxContainer_deps - QtAxContainer_SOURCE_DIR - QtAxContainer_SRC - "" - ${QtAxContainer_BINARY_DIR}/typesystem_axcontainer.xml) +create_pyside_module(NAME QtAxContainer + INCLUDE_DIRS QtAxContainer_include_dirs + LIBRARIES QtAxContainer_libraries + DEPS QtAxContainer_deps + TYPESYSTEM_PATH QtAxContainer_SOURCE_DIR + SOURCES QtAxContainer_SRC + TYPESYSTEM_NAME ${QtAxContainer_BINARY_DIR}/typesystem_axcontainer.xml) diff --git a/sources/pyside2/PySide2/QtCharts/CMakeLists.txt b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt index fa177300d..c7611edb0 100644 --- a/sources/pyside2/PySide2/QtCharts/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt @@ -81,10 +81,9 @@ set(QtCharts_libraries pyside2 set(QtCharts_deps QtCore QtGui QtWidgets) -create_pyside_module(QtCharts - QtCharts_include_dirs - QtCharts_libraries - QtCharts_deps - QtCharts_SOURCE_DIR - QtCharts_SRC - "") +create_pyside_module(NAME QtCharts + INCLUDE_DIRS QtCharts_include_dirs + LIBRARIES QtCharts_libraries + DEPS QtCharts_deps + TYPESYSTEM_PATH QtCharts_SOURCE_DIR + SOURCES QtCharts_SRC) diff --git a/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt b/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt index 4fb62ee99..9bd5c0547 100644 --- a/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt @@ -22,10 +22,9 @@ set(QtConcurrent_libraries pyside2 ) set(QtConcurrent_deps QtCore) -create_pyside_module(QtConcurrent - QtConcurrent_include_dirs - QtConcurrent_libraries - QtConcurrent_deps - QtConcurrent_SOURCE_DIR - QtConcurrent_SRC - "") +create_pyside_module(NAME QtConcurrent + INCLUDE_DIRS QtConcurrent_include_dirs + LIBRARIES QtConcurrent_libraries + DEPS QtConcurrent_deps + TYPESYSTEM_PATH QtConcurrent_SOURCE_DIR + SOURCES QtConcurrent_SRC) diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index 08604aa87..25d30e8bb 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -200,15 +200,14 @@ set(QtCore_libraries pyside2 ${SHIBOKEN_LIBRARY} ${Qt5Core_LIBRARIES} ) -create_pyside_module(QtCore - QtCore_include_dirs - QtCore_libraries - "" - QtCore_SOURCE_DIR - QtCore_SRC - QtCore_gluecode - ${QtCore_BINARY_DIR}/typesystem_core.xml - "" - QtCore_glue_sources + +create_pyside_module(NAME QtCore + INCLUDE_DIRS QtCore_include_dirs + LIBRARIES QtCore_libraries + TYPESYSTEM_PATH QtCore_SOURCE_DIR + SOURCES QtCore_SRC + STATIC_SOURCES QtCore_gluecode + TYPESYSTEM_NAME ${QtCore_BINARY_DIR}/typesystem_core.xml + GLUE_SOURCES QtCore_glue_sources ) diff --git a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt index e61a70234..59c779fbd 100644 --- a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt @@ -61,10 +61,9 @@ set(QtDataVisualization_libraries pyside2 set(QtDataVisualization_deps QtCore QtGui) -create_pyside_module(QtDataVisualization - QtDataVisualization_include_dirs - QtDataVisualization_libraries - QtDataVisualization_deps - QtDataVisualization_SOURCE_DIR - QtDataVisualization_SRC - "") +create_pyside_module(NAME QtDataVisualization + INCLUDE_DIRS QtDataVisualization_include_dirs + LIBRARIES QtDataVisualization_libraries + DEPS QtDataVisualization_deps + TYPESYSTEM_PATH QtDataVisualization_SOURCE_DIR + SOURCES QtDataVisualization_SRC) diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt index 38768ab0a..f514ea7c9 100644 --- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt @@ -244,16 +244,15 @@ set(QtGui_libraries pyside2 ${Qt5Gui_LIBRARIES}) set(QtGui_deps QtCore) -create_pyside_module(QtGui - QtGui_include_dirs - QtGui_libraries - QtGui_deps - QtGui_SOURCE_DIR - QtGui_SRC - QPYTEXTOBJECT_MOC - ${QtGui_BINARY_DIR}/typesystem_gui.xml - QtGui_DROPPED_ENTRIES - "") +create_pyside_module(NAME QtGui + INCLUDE_DIRS QtGui_include_dirs + LIBRARIES QtGui_libraries + DEPS QtGui_deps + TYPESYSTEM_PATH QtGui_SOURCE_DIR + SOURCES QtGui_SRC + STATIC_SOURCES QPYTEXTOBJECT_MOC + TYPESYSTEM_NAME ${QtGui_BINARY_DIR}/typesystem_gui.xml + DROPPED_ENTRIES QtGui_DROPPED_ENTRIES) install(FILES ${pyside2_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide2/QtGui/) diff --git a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt index 342863a4f..102eef91f 100644 --- a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt @@ -39,10 +39,9 @@ set(QtHelp_libraries pyside2 set(QtHelp_deps QtWidgets) -create_pyside_module(QtHelp - QtHelp_include_dirs - QtHelp_libraries - QtHelp_deps - QtHelp_SOURCE_DIR - QtHelp_SRC - "") +create_pyside_module(NAME QtHelp + INCLUDE_DIRS QtHelp_include_dirs + LIBRARIES QtHelp_libraries + DEPS QtHelp_deps + TYPESYSTEM_PATH QtHelp_SOURCE_DIR + SOURCES QtHelp_SRC) diff --git a/sources/pyside2/PySide2/QtLocation/CMakeLists.txt b/sources/pyside2/PySide2/QtLocation/CMakeLists.txt index f968d1a1c..b36613256 100644 --- a/sources/pyside2/PySide2/QtLocation/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtLocation/CMakeLists.txt @@ -69,12 +69,10 @@ set(QtLocation_libraries pyside2 set(QtLocation_deps QtCore QtPositioning) -create_pyside_module(QtLocation - QtLocation_include_dirs - QtLocation_libraries - QtLocation_deps - QtLocation_SOURCE_DIR - QtLocation_SRC - "" - "" - QtLocation_DROPPED_ENTRIES) +create_pyside_module(NAME QtLocation + INCLUDE_DIRS QtLocation_include_dirs + LIBRARIES QtLocation_libraries + DEPS QtLocation_deps + TYPESYSTEM_PATH QtLocation_SOURCE_DIR + SOURCES QtLocation_SRC + DROPPED_ENTRIES QtLocation_DROPPED_ENTRIES) diff --git a/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt b/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt index 6c69a784c..281596185 100644 --- a/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt @@ -28,10 +28,9 @@ set(QtMacExtras_libraries pyside2 set(QtMacExtras_deps QtCore QtGui) -create_pyside_module(QtMacExtras - QtMacExtras_include_dirs - QtMacExtras_libraries - QtMacExtras_deps - QtMacExtras_SOURCE_DIR - QtMacExtras_SRC - "") +create_pyside_module(NAME QtMacExtras + INCLUDE_DIRS QtMacExtras_include_dirs + LIBRARIES QtMacExtras_libraries + DEPS QtMacExtras_deps + TYPESYSTEM_PATH QtMacExtras_SOURCE_DIR + SOURCES QtMacExtras_SRC) diff --git a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt index e9caaa64b..71e575da3 100644 --- a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt @@ -125,10 +125,9 @@ set(QtMultimedia_libraries pyside2 ) set(QtMultimedia_deps QtCore QtGui QtNetwork) -create_pyside_module(QtMultimedia - QtMultimedia_include_dirs - QtMultimedia_libraries - QtMultimedia_deps - QtMultimedia_SOURCE_DIR - QtMultimedia_SRC - "") +create_pyside_module(NAME QtMultimedia + INCLUDE_DIRS QtMultimedia_include_dirs + LIBRARIES QtMultimedia_libraries + DEPS QtMultimedia_deps + TYPESYSTEM_PATH QtMultimedia_SOURCE_DIR + SOURCES QtMultimedia_SRC) diff --git a/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt index abae2ceb7..09c3ce994 100644 --- a/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt @@ -38,10 +38,9 @@ set(QtMultimediaWidgets_libraries pyside2 set(QtMultimediaWidgets_deps QtCore QtGui QtNetwork QtWidgets QtMultimedia) -create_pyside_module(QtMultimediaWidgets - QtMultimediaWidgets_include_dirs - QtMultimediaWidgets_libraries - QtMultimediaWidgets_deps - QtMultimediaWidgets_SOURCE_DIR - QtMultimediaWidgets_SRC - "") +create_pyside_module(NAME QtMultimediaWidgets + INCLUDE_DIRS QtMultimediaWidgets_include_dirs + LIBRARIES QtMultimediaWidgets_libraries + DEPS QtMultimediaWidgets_deps + TYPESYSTEM_PATH QtMultimediaWidgets_SOURCE_DIR + SOURCES QtMultimediaWidgets_SRC) diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt index a7c8dd8f6..cd9517889 100644 --- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt @@ -109,12 +109,10 @@ set(QtNetwork_libraries pyside2 set(QtNetwork_deps QtCore) -create_pyside_module(QtNetwork - QtNetwork_include_dirs - QtNetwork_libraries - QtNetwork_deps - QtNetwork_SOURCE_DIR - QtNetwork_SRC - "" - "" - QtNetwork_DROPPED_ENTRIES) +create_pyside_module(NAME QtNetwork + INCLUDE_DIRS QtNetwork_include_dirs + LIBRARIES QtNetwork_libraries + DEPS QtNetwork_deps + TYPESYSTEM_PATH QtNetwork_SOURCE_DIR + SOURCES QtNetwork_SRC + DROPPED_ENTRIES QtNetwork_DROPPED_ENTRIES) diff --git a/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt b/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt index 9a8b64050..e23cd36b1 100644 --- a/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt @@ -37,10 +37,9 @@ set(QtOpenGL_libraries pyside2 ${Qt5OpenGL_LIBRARIES}) set(QtOpenGL_deps QtWidgets) -create_pyside_module(QtOpenGL - QtOpenGL_include_dirs - QtOpenGL_libraries - QtOpenGL_deps - QtOpenGL_SOURCE_DIR - QtOpenGL_SRC - "") +create_pyside_module(NAME QtOpenGL + INCLUDE_DIRS QtOpenGL_include_dirs + LIBRARIES QtOpenGL_libraries + DEPS QtOpenGL_deps + TYPESYSTEM_PATH QtOpenGL_SOURCE_DIR + SOURCES QtOpenGL_SRC) diff --git a/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt b/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt index 3a2eb9cf5..ecbcd9f78 100644 --- a/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt @@ -44,12 +44,10 @@ set(QtPositioning_libraries pyside2 set(QtPositioning_deps QtCore) -create_pyside_module(QtPositioning - QtPositioning_include_dirs - QtPositioning_libraries - QtPositioning_deps - QtPositioning_SOURCE_DIR - QtPositioning_SRC - "" - "" - QtPositioning_DROPPED_ENTRIES) +create_pyside_module(NAME QtPositioning + INCLUDE_DIRS QtPositioning_include_dirs + LIBRARIES QtPositioning_libraries + DEPS QtPositioning_deps + TYPESYSTEM_PATH QtPositioning_SOURCE_DIR + SOURCES QtPositioning_SRC + DROPPED_ENTRIES QtPositioning_DROPPED_ENTRIES) diff --git a/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt b/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt index 201dd6d69..31b86290d 100644 --- a/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt @@ -35,10 +35,9 @@ set(QtPrintSupport_libraries pyside2 ${Qt5PrintSupport_LIBRARIES} ) set(QtPrintSupport_deps QtWidgets) -create_pyside_module(QtPrintSupport - QtPrintSupport_include_dirs - QtPrintSupport_libraries - QtPrintSupport_deps - QtPrintSupport_SOURCE_DIR - QtPrintSupport_SRC - "") +create_pyside_module(NAME QtPrintSupport + INCLUDE_DIRS QtPrintSupport_include_dirs + LIBRARIES QtPrintSupport_libraries + DEPS QtPrintSupport_deps + TYPESYSTEM_PATH QtPrintSupport_SOURCE_DIR + SOURCES QtPrintSupport_SRC) diff --git a/sources/pyside2/PySide2/QtQml/CMakeLists.txt b/sources/pyside2/PySide2/QtQml/CMakeLists.txt index fb09443c1..c584c3371 100644 --- a/sources/pyside2/PySide2/QtQml/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtQml/CMakeLists.txt @@ -56,10 +56,10 @@ set(QtQml_libraries pyside2 set(QtQml_deps QtGui QtNetwork) -create_pyside_module(QtQml - QtQml_include_dirs - QtQml_libraries - QtQml_deps - QtQml_SOURCE_DIR - QtQml_SRC - QtQml_registerType) +create_pyside_module(NAME QtQml + INCLUDE_DIRS QtQml_include_dirs + LIBRARIES QtQml_libraries + DEPS QtQml_deps + TYPESYSTEM_PATH QtQml_SOURCE_DIR + SOURCES QtQml_SRC + STATIC_SOURCES QtQml_registerType) diff --git a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt index 01e369e7a..788d6d50e 100644 --- a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt @@ -84,10 +84,10 @@ set(QtQuick_libraries pyside2 set(QtQuick_deps QtGui QtNetwork QtQml) -create_pyside_module(QtQuick - QtQuick_include_dirs - QtQuick_libraries - QtQuick_deps - QtQuick_SOURCE_DIR - QtQuick_SRC - QtQuick_registerType) +create_pyside_module(NAME QtQuick + INCLUDE_DIRS QtQuick_include_dirs + LIBRARIES QtQuick_libraries + DEPS QtQuick_deps + TYPESYSTEM_PATH QtQuick_SOURCE_DIR + SOURCES QtQuick_SRC + STATIC_SOURCES QtQuick_registerType) diff --git a/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt index 86991208a..76f81870d 100644 --- a/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt @@ -38,10 +38,9 @@ set(QtQuickWidgets_libraries pyside2 set(QtQuickWidgets_deps QtGui QtQml QtQuick QtWidgets QtNetwork) -create_pyside_module(QtQuickWidgets - QtQuickWidgets_include_dirs - QtQuickWidgets_libraries - QtQuickWidgets_deps - QtQuickWidgets_SOURCE_DIR - QtQuickWidgets_SRC - "") +create_pyside_module(NAME QtQuickWidgets + INCLUDE_DIRS QtQuickWidgets_include_dirs + LIBRARIES QtQuickWidgets_libraries + DEPS QtQuickWidgets_deps + TYPESYSTEM_PATH QtQuickWidgets_SOURCE_DIR + SOURCES QtQuickWidgets_SRC) diff --git a/sources/pyside2/PySide2/QtScript/CMakeLists.txt b/sources/pyside2/PySide2/QtScript/CMakeLists.txt index 08f5847b6..dfcb80789 100644 --- a/sources/pyside2/PySide2/QtScript/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtScript/CMakeLists.txt @@ -37,13 +37,10 @@ set(QtScript_libraries pyside2 ${Qt5Core_LIBRARIES} ${Qt5Script_LIBRARIES}) set(QtScript_deps QtCore) -create_pyside_module(QtScript - QtScript_include_dirs - QtScript_libraries - QtScript_deps - QtScript_SOURCE_DIR - QtScript_SRC - "" - "" - "" - QtScript_glue_sources) +create_pyside_module(NAME QtScript + INCLUDE_DIRS QtScript_include_dirs + LIBRARIES QtScript_libraries + DEPS QtScript_deps + TYPESYSTEM_PATH QtScript_SOURCE_DIR + SOURCES QtScript_SRC + GLUE_SOURCES QtScript_glue_sources) diff --git a/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt b/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt index 92bf1a545..39bb0adc6 100644 --- a/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt @@ -32,10 +32,9 @@ set(QtScriptTools_libraries pyside2 set(QtScriptTools_deps QtCore QtScript QtGui QtWidgets) -create_pyside_module(QtScriptTools - QtScriptTools_include_dirs - QtScriptTools_libraries - QtScriptTools_deps - QtScriptTools_SOURCE_DIR - QtScriptTools_SRC - "") +create_pyside_module(NAME QtScriptTools + INCLUDE_DIRS QtScriptTools_include_dirs + LIBRARIES QtScriptTools_libraries + DEPS QtScriptTools_deps + TYPESYSTEM_PATH QtScriptTools_SOURCE_DIR + SOURCES QtScriptTools_SRC) diff --git a/sources/pyside2/PySide2/QtScxml/CMakeLists.txt b/sources/pyside2/PySide2/QtScxml/CMakeLists.txt index 0a75ffce6..35ca46427 100644 --- a/sources/pyside2/PySide2/QtScxml/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtScxml/CMakeLists.txt @@ -49,12 +49,10 @@ set(QtScxml_libraries pyside2 set(QtScxml_deps QtCore) -create_pyside_module(QtScxml - QtScxml_include_dirs - QtScxml_libraries - QtScxml_deps - QtScxml_SOURCE_DIR - QtScxml_SRC - "" - "" - QtScxml_DROPPED_ENTRIES) +create_pyside_module(NAME QtScxml + INCLUDE_DIRS QtScxml_include_dirs + LIBRARIES QtScxml_libraries + DEPS QtScxml_deps + TYPESYSTEM_PATH QtScxml_SOURCE_DIR + SOURCES QtScxml_SRC + DROPPED_ENTRIES QtScxml_DROPPED_ENTRIES) diff --git a/sources/pyside2/PySide2/QtSensors/CMakeLists.txt b/sources/pyside2/PySide2/QtSensors/CMakeLists.txt index 226625443..933c266c0 100644 --- a/sources/pyside2/PySide2/QtSensors/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtSensors/CMakeLists.txt @@ -95,12 +95,10 @@ set(QtSensors_libraries pyside2 set(QtSensors_deps QtCore) -create_pyside_module(QtSensors - QtSensors_include_dirs - QtSensors_libraries - QtSensors_deps - QtSensors_SOURCE_DIR - QtSensors_SRC - "" - "" - QtSensors_DROPPED_ENTRIES) +create_pyside_module(NAME QtSensors + INCLUDE_DIRS QtSensors_include_dirs + LIBRARIES QtSensors_libraries + DEPS QtSensors_deps + TYPESYSTEM_PATH QtSensors_SOURCE_DIR + SOURCES QtSensors_SRC + DROPPED_ENTRIES QtSensors_DROPPED_ENTRIES) diff --git a/sources/pyside2/PySide2/QtSql/CMakeLists.txt b/sources/pyside2/PySide2/QtSql/CMakeLists.txt index 0573ab5cd..a72d06118 100644 --- a/sources/pyside2/PySide2/QtSql/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtSql/CMakeLists.txt @@ -45,10 +45,9 @@ set(QtSql_libraries pyside2 ${Qt5Sql_LIBRARIES}) set(QtSql_deps QtWidgets) -create_pyside_module(QtSql - QtSql_include_dirs - QtSql_libraries - QtSql_deps - QtSql_SOURCE_DIR - QtSql_SRC - "") +create_pyside_module(NAME QtSql + INCLUDE_DIRS QtSql_include_dirs + LIBRARIES QtSql_libraries + DEPS QtSql_deps + TYPESYSTEM_PATH QtSql_SOURCE_DIR + SOURCES QtSql_SRC) diff --git a/sources/pyside2/PySide2/QtSvg/CMakeLists.txt b/sources/pyside2/PySide2/QtSvg/CMakeLists.txt index 72914b188..9cc2539b1 100644 --- a/sources/pyside2/PySide2/QtSvg/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtSvg/CMakeLists.txt @@ -32,10 +32,9 @@ set(QtSvg_libraries pyside2 ) set(QtSvg_deps QtWidgets) -create_pyside_module(QtSvg - QtSvg_include_dirs - QtSvg_libraries - QtSvg_deps - QtSvg_SOURCE_DIR - QtSvg_SRC - "") +create_pyside_module(NAME QtSvg + INCLUDE_DIRS QtSvg_include_dirs + LIBRARIES QtSvg_libraries + DEPS QtSvg_deps + TYPESYSTEM_PATH QtSvg_SOURCE_DIR + SOURCES QtSvg_SRC) diff --git a/sources/pyside2/PySide2/QtTest/CMakeLists.txt b/sources/pyside2/PySide2/QtTest/CMakeLists.txt index 6d2630f10..ac325ed95 100644 --- a/sources/pyside2/PySide2/QtTest/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtTest/CMakeLists.txt @@ -36,10 +36,9 @@ set(QtTest_libraries pyside2 ) set(QtTest_deps QtWidgets) -create_pyside_module(QtTest - QtTest_include_dirs - QtTest_libraries - QtTest_deps - QtTest_SOURCE_DIR - QtTest_SRC - "") +create_pyside_module(NAME QtTest + INCLUDE_DIRS QtTest_include_dirs + LIBRARIES QtTest_libraries + DEPS QtTest_deps + TYPESYSTEM_PATH QtTest_SOURCE_DIR + SOURCES QtTest_SRC) diff --git a/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt b/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt index 63b5a3669..d9e827c0e 100644 --- a/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt @@ -26,10 +26,9 @@ set(QtTextToSpeech_libraries pyside2 set(QtTextToSpeech_deps QtCore QtMultimedia) -create_pyside_module(QtTextToSpeech - QtTextToSpeech_include_dirs - QtTextToSpeech_libraries - QtTextToSpeech_deps - QtTextToSpeech_SOURCE_DIR - QtTextToSpeech_SRC - "") +create_pyside_module(NAME QtTextToSpeech + INCLUDE_DIRS QtTextToSpeech_include_dirs + LIBRARIES QtTextToSpeech_libraries + DEPS QtTextToSpeech_deps + TYPESYSTEM_PATH QtTextToSpeech_SOURCE_DIR + SOURCES QtTextToSpeech_SRC) diff --git a/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt b/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt index 0040c000e..fc034ec1b 100644 --- a/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt @@ -36,13 +36,10 @@ set(QtUiTools_libraries pyside2 ${Qt5Widgets_LIBRARIES} ) set(QtUiTools_deps QtWidgets QtXml) -create_pyside_module(QtUiTools - QtUiTools_include_dirs - QtUiTools_libraries - QtUiTools_deps - QtUiTools_SOURCE_DIR - QtUiTools_SRC - "" - "" - "" - QtUiTools_glue_sources) +create_pyside_module(NAME QtUiTools + INCLUDE_DIRS QtUiTools_include_dirs + LIBRARIES QtUiTools_libraries + DEPS QtUiTools_deps + TYPESYSTEM_PATH QtUiTools_SOURCE_DIR + SOURCES QtUiTools_SRC + GLUE_SOURCES QtUiTools_glue_sources) diff --git a/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt b/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt index b7fee0d17..c06c690ac 100644 --- a/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt @@ -24,10 +24,9 @@ set(QtWebChannel_libraries pyside2 ) set(QtWebChannel_deps QtCore) -create_pyside_module(QtWebChannel - QtWebChannel_include_dirs - QtWebChannel_libraries - QtWebChannel_deps - QtWebChannel_SOURCE_DIR - QtWebChannel_SRC - "") +create_pyside_module(NAME QtWebChannel + INCLUDE_DIRS QtWebChannel_include_dirs + LIBRARIES QtWebChannel_libraries + DEPS QtWebChannel_deps + TYPESYSTEM_PATH QtWebChannel_SOURCE_DIR + SOURCES QtWebChannel_SRC) diff --git a/sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt index 9029509ee..dc673ad06 100644 --- a/sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt @@ -22,11 +22,10 @@ set(QtWebEngine_libraries pyside2 ${Qt5Core_LIBRARIES} ) set(QtWebEngine_deps QtCore) -create_pyside_module(QtWebEngine - QtWebEngine_include_dirs - QtWebEngine_libraries - QtWebEngine_deps - QtWebEngine_SOURCE_DIR - QtWebEngine_SRC - "") +create_pyside_module(NAME QtWebEngine + INCLUDE_DIRS QtWebEngine_include_dirs + LIBRARIES QtWebEngine_libraries + DEPS QtWebEngine_deps + TYPESYSTEM_PATH QtWebEngine_SOURCE_DIR + SOURCES QtWebEngine_SRC) diff --git a/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt index 109b9f208..fe660aa7b 100644 --- a/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt @@ -27,11 +27,10 @@ set(QtWebEngineCore_libraries pyside2 ${Qt5Core_LIBRARIES} ) set(QtWebEngineCore_deps QtCore) -create_pyside_module(QtWebEngineCore - QtWebEngineCore_include_dirs - QtWebEngineCore_libraries - QtWebEngineCore_deps - QtWebEngineCore_SOURCE_DIR - QtWebEngineCore_SRC - "") +create_pyside_module(NAME QtWebEngineCore + INCLUDE_DIRS QtWebEngineCore_include_dirs + LIBRARIES QtWebEngineCore_libraries + DEPS QtWebEngineCore_deps + TYPESYSTEM_PATH QtWebEngineCore_SOURCE_DIR + SOURCES QtWebEngineCore_SRC) diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt index e0648c491..7711aecbc 100644 --- a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt @@ -48,11 +48,10 @@ set(QtWebEngineWidgets_libraries pyside2 ${Qt5Core_LIBRARIES} ) set(QtWebEngineWidgets_deps QtGui QtWidgets QtNetwork QtWebChannel) -create_pyside_module(QtWebEngineWidgets - QtWebEngineWidgets_include_dirs - QtWebEngineWidgets_libraries - QtWebEngineWidgets_deps - QtWebEngineWidgets_SOURCE_DIR - QtWebEngineWidgets_SRC - "") +create_pyside_module(NAME QtWebEngineWidgets + INCLUDE_DIRS QtWebEngineWidgets_include_dirs + LIBRARIES QtWebEngineWidgets_libraries + DEPS QtWebEngineWidgets_deps + TYPESYSTEM_PATH QtWebEngineWidgets_SOURCE_DIR + SOURCES QtWebEngineWidgets_SRC) diff --git a/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt b/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt index 78f865cac..76f647450 100644 --- a/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt @@ -29,11 +29,10 @@ set(QtWebKit_libraries pyside2 ${Qt5Core_LIBRARIES} ) set(QtWebKit_deps QtGui QtNetwork) -create_pyside_module(QtWebKit - QtWebKit_include_dirs - QtWebKit_libraries - QtWebKit_deps - QtWebKit_SOURCE_DIR - QtWebKit_SRC - "") +create_pyside_module(NAME QtWebKit + INCLUDE_DIRS QtWebKit_include_dirs + LIBRARIES QtWebKit_libraries + DEPS QtWebKit_deps + TYPESYSTEM_PATH QtWebKit_SOURCE_DIR + SOURCES QtWebKit_SRC) diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt index cd7aa32dd..7422a05da 100644 --- a/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt @@ -60,11 +60,10 @@ set(QtWebKitWidgets_libraries pyside2 ${Qt5Core_LIBRARIES} ) set(QtWebKitWidgets_deps QtWidgets QtPrintSupport QtNetwork) -create_pyside_module(QtWebKitWidgets - QtWebKitWidgets_include_dirs - QtWebKitWidgets_libraries - QtWebKitWidgets_deps - QtWebKitWidgets_SOURCE_DIR - QtWebKitWidgets_SRC - "") +create_pyside_module(NAME QtWebKitWidgets + INCLUDE_DIRS QtWebKitWidgets_include_dirs + LIBRARIES QtWebKitWidgets_libraries + DEPS QtWebKitWidgets_deps + TYPESYSTEM_PATH QtWebKitWidgets_SOURCE_DIR + SOURCES QtWebKitWidgets_SRC) diff --git a/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt index 495fd4e7b..98f85f9ab 100644 --- a/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt @@ -32,10 +32,9 @@ set(QtWebSockets_libraries pyside2 set(QtWebSockets_deps QtNetwork) -create_pyside_module(QtWebSockets - QtWebSockets_include_dirs - QtWebSockets_libraries - QtWebSockets_deps - QtWebSockets_SOURCE_DIR - QtWebSockets_SRC - "") +create_pyside_module(NAME QtWebSockets + INCLUDE_DIRS QtWebSockets_include_dirs + LIBRARIES QtWebSockets_libraries + DEPS QtWebSockets_deps + TYPESYSTEM_PATH QtWebSockets_SOURCE_DIR + SOURCES QtWebSockets_SRC) diff --git a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt index 5f10d5988..4267c1160 100644 --- a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt @@ -231,13 +231,10 @@ set(QtWidgets_libraries pyside2 ) set(QtWidgets_deps QtGui) -create_pyside_module(QtWidgets - QtWidgets_include_dirs - QtWidgets_libraries - QtWidgets_deps - QtWidgets_SOURCE_DIR - QtWidgets_SRC - "" - ${QtWidgets_BINARY_DIR}/typesystem_widgets.xml - "" - "") +create_pyside_module(NAME QtWidgets + INCLUDE_DIRS QtWidgets_include_dirs + LIBRARIES QtWidgets_libraries + DEPS QtWidgets_deps + TYPESYSTEM_PATH QtWidgets_SOURCE_DIR + SOURCES QtWidgets_SRC + TYPESYSTEM_NAME ${QtWidgets_BINARY_DIR}/typesystem_widgets.xml) diff --git a/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt b/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt index 5932792e9..9729d319a 100644 --- a/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt @@ -36,10 +36,9 @@ set(QtWinExtras_libraries pyside2 set(QtWinExtras_deps QtCore QtGui) -create_pyside_module(QtWinExtras - QtWinExtras_include_dirs - QtWinExtras_libraries - QtWinExtras_deps - QtWinExtras_SOURCE_DIR - QtWinExtras_SRC - "") +create_pyside_module(NAME QtWinExtras + INCLUDE_DIRS QtWinExtras_include_dirs + LIBRARIES QtWinExtras_libraries + DEPS QtWinExtras_deps + TYPESYSTEM_PATH QtWinExtras_SOURCE_DIR + SOURCES QtWinExtras_SRC) diff --git a/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt b/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt index 4f0111905..fc0b21f1f 100644 --- a/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt @@ -28,10 +28,9 @@ set(QtX11Extras_libraries pyside2 set(QtX11Extras_deps QtCore QtGui) -create_pyside_module(QtX11Extras - QtX11Extras_include_dirs - QtX11Extras_libraries - QtX11Extras_deps - QtX11Extras_SOURCE_DIR - QtX11Extras_SRC - "") +create_pyside_module(NAME QtX11Extras + INCLUDE_DIRS QtX11Extras_include_dirs + LIBRARIES QtX11Extras_libraries + DEPS QtX11Extras_deps + TYPESYSTEM_PATH QtX11Extras_SOURCE_DIR + SOURCES QtX11Extras_SRC) diff --git a/sources/pyside2/PySide2/QtXml/CMakeLists.txt b/sources/pyside2/PySide2/QtXml/CMakeLists.txt index 9c724cffb..7a6a707b7 100644 --- a/sources/pyside2/PySide2/QtXml/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtXml/CMakeLists.txt @@ -52,10 +52,9 @@ set(QtXml_libraries pyside2 ${Qt5Xml_LIBRARIES}) set(QtXml_deps QtCore) -create_pyside_module(QtXml - QtXml_include_dirs - QtXml_libraries - QtXml_deps - QtXml_SOURCE_DIR - QtXml_SRC - "") +create_pyside_module(NAME QtXml + INCLUDE_DIRS QtXml_include_dirs + LIBRARIES QtXml_libraries + DEPS QtXml_deps + TYPESYSTEM_PATH QtXml_SOURCE_DIR + SOURCES QtXml_SRC) diff --git a/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt b/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt index d279f43ae..d9e936517 100644 --- a/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt @@ -35,11 +35,10 @@ set(QtXmlPatterns_libraries pyside2 ${Qt5XmlPatterns_LIBRARIES}) set(QtXmlPatterns_deps QtCore) -create_pyside_module(QtXmlPatterns - QtXmlPatterns_include_dirs - QtXmlPatterns_libraries - QtXmlPatterns_deps - QtXmlPatterns_SOURCE_DIR - QtXmlPatterns_SRC - "") +create_pyside_module(NAME QtXmlPatterns + INCLUDE_DIRS QtXmlPatterns_include_dirs + LIBRARIES QtXmlPatterns_libraries + DEPS QtXmlPatterns_deps + TYPESYSTEM_PATH QtXmlPatterns_SOURCE_DIR + SOURCES QtXmlPatterns_SRC) diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake index dd4845033..42ba8e8a0 100644 --- a/sources/pyside2/cmake/Macros/PySideModules.cmake +++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -1,3 +1,14 @@ +include(CMakeParseArguments) + +# A version of cmake_parse_arguments that makes sure all arguments are processed and errors out +# with a message about ${type} having received unknown arguments. +macro(pyside_parse_all_arguments prefix type flags options multiopts) + cmake_parse_arguments(${prefix} "${flags}" "${options}" "${multiopts}" ${ARGN}) + if(DEFINED ${prefix}_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Unknown arguments were passed to ${type} (${${prefix}_UNPARSED_ARGUMENTS}).") + endif() +endmacro() + macro(make_path varname) # accepts any number of path variables string(REPLACE ";" "${PATH_SEP}" ${varname} "${ARGN}") @@ -7,40 +18,59 @@ macro(unmake_path varname) string(REPLACE "${PATH_SEP}" ";" ${varname} "${ARGN}") endmacro() -macro(create_pyside_module - module_name - module_include_dir - module_libraries - module_deps - module_typesystem_path - module_sources - module_static_sources - #module_typesystem_name - #module_dropped_entries - #module_glue_sources - ) - string(TOLOWER ${module_name} _module) - string(REGEX REPLACE ^qt "" _module ${_module}) - if(${ARGC} GREATER 7) - set (typesystem_name ${ARGV7}) - else() - set (typesystem_name "") +# Sample usage +# create_pyside_module(NAME QtGui +# INCLUDE_DIRS QtGui_include_dirs +# LIBRARIES QtGui_libraries +# DEPS QtGui_deps +# TYPESYSTEM_PATH QtGui_SOURCE_DIR +# SOURCES QtGui_SRC +# STATIC_SOURCES QtGui_static_sources +# TYPESYSTEM_NAME ${QtGui_BINARY_DIR}/typesystem_gui.xml +# DROPPED_ENTRIES QtGui_DROPPED_ENTRIES +# GLUE_SOURCES QtGui_glue_sources) +macro(create_pyside_module) + pyside_parse_all_arguments( + "module" # Prefix + "create_pyside_module" # Macro name + "" # Flags + "NAME;TYPESYSTEM_PATH;TYPESYSTEM_NAME" # Single value + "INCLUDE_DIRS;LIBRARIES;DEPS;SOURCES;STATIC_SOURCES;DROPPED_ENTRIES;GLUE_SOURCES" # Multival + ${ARGN} # Number of arguments given when the macros is called + ) + + if ("${module_NAME}" STREQUAL "") + message(FATAL_ERROR "create_pyside_module needs a NAME value.") + endif() + if ("${module_INCLUDE_DIRS}" STREQUAL "") + message(FATAL_ERROR "create_pyside_module needs at least one INCLUDE_DIRS value.") endif() - if(${ARGC} GREATER 8) - string(REPLACE ";" "\\;" dropped_entries "${${ARGV8}}") + if ("${module_TYPESYSTEM_PATH}" STREQUAL "") + message(FATAL_ERROR "create_pyside_module needs a TYPESYSTEM_PATH value.") + endif() + if ("${module_SOURCES}" STREQUAL "") + message(FATAL_ERROR "create_pyside_module needs at least one SOURCES value.") + endif() + + string(TOLOWER ${module_NAME} _module) + string(REGEX REPLACE ^qt "" _module ${_module}) + + if(${module_DROPPED_ENTRIES}) + string(REPLACE ";" "\\;" dropped_entries "${${module_DROPPED_ENTRIES}}") else() set (dropped_entries "") endif() - if(${ARGC} GREATER 9) - set (glue_sources "${${ARGV9}}") + + if(${module_GLUE_SOURCES}) + set (module_GLUE_SOURCES "${${module_GLUE_SOURCES}}") else() - set (glue_sources "") + set (module_GLUE_SOURCES "") endif() - if (NOT EXISTS ${typesystem_name}) + if (NOT EXISTS ${module_TYPESYSTEM_NAME}) set(typesystem_path ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${_module}.xml) else() - set(typesystem_path ${typesystem_name}) + set(typesystem_path ${module_TYPESYSTEM_NAME}) endif() # Create typesystem XML dependencies list, so that whenever they change, shiboken is invoked @@ -50,7 +80,7 @@ macro(create_pyside_module get_filename_component(typesystem_root "${CMAKE_CURRENT_SOURCE_DIR}" DIRECTORY) - set(deps ${module_name} ${${module_deps}}) + set(deps ${module_NAME} ${${module_DEPS}}) foreach(dep ${deps}) set(glob_expression "${typesystem_root}/${dep}/*.xml") file(GLOB type_system_files ${glob_expression}) @@ -75,73 +105,73 @@ macro(create_pyside_module get_filename_component(pyside_binary_dir ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY) # Install module glue files. - string(TOLOWER ${module_name} lower_module_name) - set(${module_name}_glue "${CMAKE_CURRENT_SOURCE_DIR}/../glue/${lower_module_name}.cpp") + string(TOLOWER ${module_NAME} lower_module_name) + set(${module_NAME}_glue "${CMAKE_CURRENT_SOURCE_DIR}/../glue/${lower_module_name}.cpp") set(${module_name}_glue_dependency "") - if(EXISTS ${${module_name}_glue}) - install(FILES ${${module_name}_glue} DESTINATION share/PySide2${pyside2_SUFFIX}/glue) - set(${module_name}_glue_dependency ${${module_name}_glue}) + if(EXISTS ${${module_NAME}_glue}) + install(FILES ${${module_NAME}_glue} DESTINATION share/PySide2${pyside2_SUFFIX}/glue) + set(${module_NAME}_glue_dependency ${${module_NAME}_glue}) endif() # Install standalone glue files into typesystems subfolder, so that the resolved relative # paths remain correct. - if (glue_sources) - install(FILES ${glue_sources} DESTINATION share/PySide2${pyside2_SUFFIX}/typesystems/glue) + if (module_GLUE_SOURCES) + install(FILES ${module_GLUE_SOURCES} DESTINATION share/PySide2${pyside2_SUFFIX}/typesystems/glue) endif() add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log" - BYPRODUCTS ${${module_sources}} + BYPRODUCTS ${${module_SOURCES}} COMMAND "${SHIBOKEN_BINARY}" ${GENERATOR_EXTRA_FLAGS} - "${pyside2_BINARY_DIR}/${module_name}_global.h" + "${pyside2_BINARY_DIR}/${module_NAME}_global.h" --include-paths=${shiboken_include_dirs} ${shiboken_framework_include_dirs_option} - --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_typesystem_path}} + --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_TYPESYSTEM_PATH}} --output-directory=${CMAKE_CURRENT_BINARY_DIR} --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt ${typesystem_path} --api-version=${SUPPORTED_QT_VERSION} --drop-type-entries="${dropped_entries}" DEPENDS ${total_type_system_files} - ${glue_sources} - ${${module_name}_glue_dependency} + ${module_GLUE_SOURCES} + ${${module_NAME}_glue_dependency} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT "Running generator for ${module_name}...") + COMMENT "Running generator for ${module_NAME}...") - include_directories(${module_name} ${${module_include_dir}} ${pyside2_SOURCE_DIR}) - add_library(${module_name} MODULE ${${module_sources}} ${${module_static_sources}}) - set_target_properties(${module_name} PROPERTIES + include_directories(${module_NAME} ${${module_INCLUDE_DIRS}} ${pyside2_SOURCE_DIR}) + add_library(${module_NAME} MODULE ${${module_SOURCES}} + ${${module_STATIC_SOURCES}}) + set_target_properties(${module_NAME} PROPERTIES PREFIX "" - OUTPUT_NAME "${module_name}${PYTHON_EXTENSION_SUFFIX}" + OUTPUT_NAME "${module_NAME}${PYTHON_EXTENSION_SUFFIX}" LIBRARY_OUTPUT_DIRECTORY ${pyside2_BINARY_DIR}) if(WIN32) - set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd") + set_target_properties(${module_NAME} PROPERTIES SUFFIX ".pyd") # Sanitize windows.h as pulled by gl.h to prevent clashes with QAbstract3dAxis::min(), etc. set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX") endif() - target_link_libraries(${module_name} ${${module_libraries}}) - if(${module_deps}) - add_dependencies(${module_name} ${${module_deps}}) + target_link_libraries(${module_NAME} ${${module_LIBRARIES}}) + if(${module_DEPS}) + add_dependencies(${module_NAME} ${${module_DEPS}}) endif() - create_generator_target(${module_name}) + create_generator_target(${module_NAME}) # build type hinting stubs - add_custom_command( TARGET ${module_name} POST_BUILD + add_custom_command( TARGET ${module_NAME} POST_BUILD COMMAND "${SHIBOKEN_PYTHON_INTERPRETER}" "${CMAKE_CURRENT_SOURCE_DIR}/../support/generate_pyi.py" run --skip --sys-path "${CMAKE_BINARY_DIR}" "${CMAKE_BINARY_DIR}/../shiboken2/shibokenmodule" --lib-path "${CMAKE_BINARY_DIR}/libpyside" "${CMAKE_BINARY_DIR}/../shiboken2/libshiboken" ) # install - install(TARGETS ${module_name} LIBRARY DESTINATION "${PYTHON_SITE_PACKAGES}/PySide2") + install(TARGETS ${module_NAME} LIBRARY DESTINATION "${PYTHON_SITE_PACKAGES}/PySide2") install(DIRECTORY "${CMAKE_BINARY_DIR}/" DESTINATION "${PYTHON_SITE_PACKAGES}" OPTIONAL FILES_MATCHING PATTERN "*.pyi") - string(TOLOWER ${module_name} lower_module_name) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide2/${module_name}/pyside2_${lower_module_name}_python.h - DESTINATION include/PySide2${pyside2_SUFFIX}/${module_name}/) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide2/${module_NAME}/pyside2_${lower_module_name}_python.h + DESTINATION include/PySide2${pyside2_SUFFIX}/${module_NAME}/) file(GLOB typesystem_files ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_*.xml ${typesystem_path}) # Copy typesystem files and remove module names from the <load-typesystem> element |