From 4d9fd447dc7baa6f1d5ca7f947de5aa48a47d486 Mon Sep 17 00:00:00 2001 From: Sylvain Bernhardt Date: Thu, 19 Aug 2021 10:35:18 +0200 Subject: [PATCH] ENH: Added Python wrapping for Qt multimedia component --- CMake/ctkMacroSetupQt.cmake | 2 +- CMakeExternals/PythonQt.cmake | 4 ++-- Libs/Scripting/Python/Core/CMakeLists.txt | 2 +- .../Python/Core/ctkScriptingPythonCoreConfigure.h.in | 1 + Libs/Scripting/Python/Core/ctk_library_options.cmake | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMake/ctkMacroSetupQt.cmake b/CMake/ctkMacroSetupQt.cmake index 3c69c3677d..617420d372 100644 --- a/CMake/ctkMacroSetupQt.cmake +++ b/CMake/ctkMacroSetupQt.cmake @@ -33,7 +33,7 @@ macro(ctkMacroSetupQt) if(CTK_QT_VERSION VERSION_GREATER "4") cmake_minimum_required(VERSION 2.8.12) find_package(Qt5 COMPONENTS Core) - set(CTK_QT5_COMPONENTS Core Xml XmlPatterns Concurrent Sql Test) + set(CTK_QT5_COMPONENTS Core Xml XmlPatterns Concurrent Sql Test Multimedia) if(CTK_ENABLE_Widgets OR CTK_LIB_Widgets OR CTK_LIB_CommandLineModules/Frontend/QtGui OR CTK_BUILD_ALL OR CTK_BUILD_ALL_LIBRARIES) list(APPEND CTK_QT5_COMPONENTS Widgets OpenGL UiTools) endif() diff --git a/CMakeExternals/PythonQt.cmake b/CMakeExternals/PythonQt.cmake index 641b906cbe..facb9e80a5 100644 --- a/CMakeExternals/PythonQt.cmake +++ b/CMakeExternals/PythonQt.cmake @@ -31,7 +31,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR) list(APPEND proj_DEPENDENCIES VTK) endif() - set(qtlibs core gui network opengl sql svg uitools xml) + set(qtlibs core gui multimedia network opengl sql svg uitools xml) # Enable Qt libraries PythonQt wrapping if required if(CTK_QT_VERSION VERSION_GREATER "4") @@ -82,7 +82,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR) ctkFunctionExtractOptimizedLibrary(PYTHON_LIBRARIES PYTHON_LIBRARY) if (CTK_QT_VERSION VERSION_GREATER "4") - set(revision_tag c306140442feb6e76d4bae672c48cd7f11d9b0cd) # patched-9 + set(revision_tag c4a5a155b2942d4b003862c3317105b4a1ea6755) # patched-9 else() set(revision_tag 90c08fb0d523622d2de9e7a91f4ef116a66a8801) # patched-5 endif() diff --git a/Libs/Scripting/Python/Core/CMakeLists.txt b/Libs/Scripting/Python/Core/CMakeLists.txt index 615a55d3da..69bb5d614e 100644 --- a/Libs/Scripting/Python/Core/CMakeLists.txt +++ b/Libs/Scripting/Python/Core/CMakeLists.txt @@ -28,7 +28,7 @@ set(KIT_resources # # Configure file describing which Qt modules are wrapped # -set(QT_PYTHON_WRAPPED_LIBRARIES_LIST Core Gui Widgets Network OpenGL Sql Svg UiTools WebKit WebKitWidgets Xml XmlPatterns) +set(QT_PYTHON_WRAPPED_LIBRARIES_LIST Core Gui Widgets Multimedia Network OpenGL Sql Svg UiTools WebKit WebKitWidgets Xml XmlPatterns) foreach(qtlib ${QT_PYTHON_WRAPPED_LIBRARIES_LIST}) string(TOUPPER ${qtlib} qtlib) set(CTK_PYTHONQT_WRAP_QT${qtlib} ${CTK_LIB_Scripting/Python/Core_PYTHONQT_WRAP_QT${qtlib}}) diff --git a/Libs/Scripting/Python/Core/ctkScriptingPythonCoreConfigure.h.in b/Libs/Scripting/Python/Core/ctkScriptingPythonCoreConfigure.h.in index f11e8c4de9..0e4728e9da 100644 --- a/Libs/Scripting/Python/Core/ctkScriptingPythonCoreConfigure.h.in +++ b/Libs/Scripting/Python/Core/ctkScriptingPythonCoreConfigure.h.in @@ -10,6 +10,7 @@ #cmakedefine CTK_PYTHONQT_WRAP_QTCORE #cmakedefine CTK_PYTHONQT_WRAP_QTGUI #cmakedefine CTK_PYTHONQT_WRAP_QTWIDGETS +#cmakedefine CTK_PYTHONQT_WRAP_QTMULTIMEDIA #cmakedefine CTK_PYTHONQT_WRAP_QTNETWORK #cmakedefine CTK_PYTHONQT_WRAP_QTOPENGL #cmakedefine CTK_PYTHONQT_WRAP_QTPRINTSUPPORT diff --git a/Libs/Scripting/Python/Core/ctk_library_options.cmake b/Libs/Scripting/Python/Core/ctk_library_options.cmake index 774776ba0c..6fb4d96e0d 100644 --- a/Libs/Scripting/Python/Core/ctk_library_options.cmake +++ b/Libs/Scripting/Python/Core/ctk_library_options.cmake @@ -11,6 +11,7 @@ set(ctk_library_options PYTHONQT_WRAP_QTCORE:OFF PYTHONQT_WRAP_QTGUI:OFF PYTHONQT_WRAP_QTWIDGETS:OFF + PYTHONQT_WRAP_QTMULTIMEDIA:OFF PYTHONQT_WRAP_QTNETWORK:OFF PYTHONQT_WRAP_QTOPENGL:OFF PYTHONQT_WRAP_QTPRINTSUPPORT:OFF