Merge branch 'fix-configure-with-pythonqt-wrapping'

* fix-configure-with-pythonqt-wrapping:
  Fixes configuration when enabling PythonQt wrapping
  ENH: Pass Qt CMake variable using "mark_as_superbuild"

CMake/ctkMacroSetupQt.cmake

@@ -75,10 +75,12 @@ macro(ctkMacroSetupQt)
       message(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
     endif()
 
-    mark_as_superbuild(QT_QMAKE_EXECUTABLE)
-
   else()
     message(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
   endif()
 
+  mark_as_superbuild(CTK_QT_VERSION)
+  mark_as_superbuild(QT_QMAKE_EXECUTABLE) # Qt 4
+  mark_as_superbuild(QT5_INSTALL_PREFIX)  # Qt 5
+
 endmacro()

CMake/ctkMacroWrapPythonQt.cmake

@@ -163,9 +163,8 @@ macro(ctkMacroWrapPythonQt WRAPPING_NAMESPACE TARGET SRCS_LIST_NAME SOURCES IS_W
     COMMENT "PythonQt Wrapping - Generating ${wrapper_init_cpp_filename}"
     VERBATIM
     )
-
-  if (CTK_QT_VERSION VERSION_EQUAL "4")
-    QT5_WRAP_CPP(${TARGET}_MOC_CXX ${CMAKE_CURRENT_BINARY_DIR}/${wrapper_h_filename})
+  if(CTK_QT_VERSION VERSION_GREATER "4")
+    qt5_wrap_cpp(${TARGET}_MOC_CXX ${CMAKE_CURRENT_BINARY_DIR}/${wrapper_h_filename})
   else()
     QT4_WRAP_CPP(${TARGET}_MOC_CXX ${CMAKE_CURRENT_BINARY_DIR}/${wrapper_h_filename})
   endif()

SuperBuild.cmake

@@ -45,8 +45,6 @@ ExternalProject_Add(${proj}
     -DCMAKE_CXX_FLAGS_INIT:STRING=${CMAKE_CXX_FLAGS_INIT}
     -DCMAKE_C_FLAGS_INIT:STRING=${CMAKE_C_FLAGS_INIT}
     -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-    -DCTK_QT_VERSION:STRING=${CTK_QT_VERSION}
-    -DQT5_INSTALL_PREFIX:PATH=${QT5_INSTALL_PREFIX}
   SOURCE_DIR ${CTK_SOURCE_DIR}
   BINARY_DIR ${CTK_BINARY_DIR}/CTK-build
   INSTALL_COMMAND ""