Merge branch 'simplify-pythonqt-module-init'

* simplify-pythonqt-module-init:
  Conditionally invoke ctkMacroBuildLibWrapper

Libs/Core/CMakeLists.txt

@@ -123,11 +123,14 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
+
 
 # Testing
 IF(BUILD_TESTING)

Libs/DICOM/Core/CMakeLists.txt

@@ -78,11 +78,13 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
 
 # Plugins
 #IF(BUILD_QTDESIGNER_PLUGINS)

Libs/DICOM/Widgets/CMakeLists.txt

@@ -79,11 +79,13 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
 
 # Plugins
 IF(BUILD_QTDESIGNER_PLUGINS)

Libs/ImageProcessing/ITK/Core/CMakeLists.txt

@@ -45,11 +45,13 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
 
 # Plugins
 #IF(BUILD_QTDESIGNER_PLUGINS)

Libs/Messaging/Core/CMakeLists.txt

@@ -48,11 +48,13 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
 
 # Plugins
 #IF(BUILD_QTDESIGNER_PLUGINS)

Libs/ModuleDescription/CMakeLists.txt

@@ -66,11 +66,13 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
 
 # Testing
 IF(BUILD_TESTING)

Libs/PluginFramework/CMakeLists.txt

@@ -151,11 +151,13 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
 
 # Testing
 IF(BUILD_TESTING)

Libs/Scripting/Python/Widgets/CMakeLists.txt

@@ -48,11 +48,13 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
 
 # Plugins
 IF(BUILD_QTDESIGNER_PLUGINS)

Libs/Visualization/VTK/Core/CMakeLists.txt

@@ -84,11 +84,13 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
 
 # Plugins
 #IF(BUILD_QTDESIGNER_PLUGINS)

Libs/Visualization/VTK/Widgets/CMakeLists.txt

@@ -130,11 +130,13 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
 
 # Plugins
 IF(BUILD_QTDESIGNER_PLUGINS)

Libs/Visualization/XIP/CMakeLists.txt

@@ -41,11 +41,13 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
 
 # Plugins
 #IF(BUILD_QTDESIGNER_PLUGINS)

Libs/Widgets/CMakeLists.txt

@@ -275,11 +275,13 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   )
 
-ctkMacroBuildLibWrapper(
-  TARGET ${PROJECT_NAME}
-  SRCS ${KIT_SRCS}
-  WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
+IF(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
+  ctkMacroBuildLibWrapper(
+    TARGET ${PROJECT_NAME}
+    SRCS ${KIT_SRCS}
+    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+    )
+ENDIF()
 
 # Plugins
 IF(BUILD_QTDESIGNER_PLUGINS)