Parcourir la source

Exposes PythonQt WRAP_ALL option

Since xmlpatterns component can't built an any of
the Qt version supported by PythonQt, removed the option
"PYTHONQT_WRAP_QTXMLPATTERNS".

See #11
Jean-Christophe Fillion-Robin il y a 12 ans
Parent
commit
91becf2853

+ 10 - 1
CMakeExternals/PythonQt.cmake

@@ -33,11 +33,20 @@ if(${add_project})
       endif()
 
       # Enable Qt libraries PythonQt wrapping if required
-      foreach(qtlib core gui network opengl sql svg uitools webkit xml xmlpatterns)
+      set(qtlibs core gui network opengl sql svg uitools webkit xml)
+      foreach(qtlib All ${qtlibs})
         string(TOUPPER ${qtlib} qtlib_uppercase)
         list(APPEND ep_PythonQt_args -DPythonQt_Wrap_Qt${qtlib}:BOOL=${CTK_LIB_Scripting/Python/Core_PYTHONQT_WRAP_QT${qtlib_uppercase}})
       endforeach()
 
+      # Force wrap option to ON if WRAP_QTALL was set to ON
+      if(${CTK_LIB_Scripting/Python/Core_PYTHONQT_WRAP_QTALL})
+        foreach(qtlib ${qtlibs})
+          string(TOUPPER ${qtlib} qtlib_uppercase)
+          set(CTK_LIB_Scripting/Python/Core_PYTHONQT_WRAP_QT${qtlib_uppercase} ON CACHE BOOL "Enable Scripting/Python/Core Library PYTHONQT_WRAP_QT${qtlib_uppercase} option" FORCE)
+        endforeach()
+      endif()
+
       # Python is required
       find_package(PythonLibs)
       if(NOT PYTHONLIBS_FOUND)

+ 1 - 1
Libs/Scripting/Python/Core/ctk_library_options.cmake

@@ -7,6 +7,7 @@
 
 set(ctk_library_options
   PYTHONQT_USE_VTK:OFF
+  PYTHONQT_WRAP_QTALL:OFF
   PYTHONQT_WRAP_QTCORE:OFF
   PYTHONQT_WRAP_QTGUI:OFF
   PYTHONQT_WRAP_QTNETWORK:OFF
@@ -16,5 +17,4 @@ set(ctk_library_options
   PYTHONQT_WRAP_QTUITOOLS:OFF
   PYTHONQT_WRAP_QTWEBKIT:OFF
   PYTHONQT_WRAP_QTXML:OFF
-  PYTHONQT_WRAP_QTXMLPATTERNS:OFF
   )