...

diff --git a/cmake/cpPlugins_Qt4Tools.cmake b/cmake/cpPlugins_Qt4Tools.cmake
index 80a2ef78bd31a18d1b136748cb335158a07ba534..88a252840cf1257b7b71a43d9048a6aae86af68f 100644 (file)
--- a/cmake/cpPlugins_Qt4Tools.cmake
+++ b/cmake/cpPlugins_Qt4Tools.cmake
@@ -1,22 +1,3 @@
-## ==========================
-## == Function to find Qt4 ==
-## ==========================
-
-FUNCTION(cpPlugins_FindQt4)
-FIND_PACKAGE(Qt4 REQUIRED)
-INCLUDE(${QT_USE_FILE})
-SET(
-  _required_vtk_modules
-  vtkGUISupportQt
-  vtkGUISupportQtOpenGL
-  )
-FOREACH(_m ${_required_vtk_modules})
-  IF(NOT ${_m}_LOADED)
-    MESSAGE(FATAL_ERROR "${_m} module is required but not available.")
-    BREAK()
-  ENDIF(NOT ${_m}_LOADED)
-ENDFOREACH(_m)
-ENDFUNCTION()
 
 ## ==================================================
 ## == Find Qt4 and check if it was well configured ==
@@ -24,20 +5,19 @@ ENDFUNCTION()
 
 SET(QT4_FOUND "0")
 IF(USE_QT4)
-  cpPlugins_FindQt4()
-#  FIND_PACKAGE(Qt4 REQUIRED)
-#  INCLUDE(${QT_USE_FILE})
-#  SET(
-#    _required_vtk_modules
-#    vtkGUISupportQt
-#    vtkGUISupportQtOpenGL
-#    )
-#  FOREACH(_m ${_required_vtk_modules})
-#    IF(NOT ${_m}_LOADED)
-#      MESSAGE(FATAL_ERROR "${_m} module is required but not available.")
-#      BREAK()
-#    ENDIF(NOT ${_m}_LOADED)
-#  ENDFOREACH(_m)
+  FIND_PACKAGE(Qt4 REQUIRED)
+  INCLUDE(${QT_USE_FILE})
+  SET(
+    _required_vtk_modules
+    vtkGUISupportQt
+    vtkGUISupportQtOpenGL
+    )
+  FOREACH(_m ${_required_vtk_modules})
+    IF(NOT ${_m}_LOADED)
+      MESSAGE(FATAL_ERROR "${_m} module is required but not available.")
+      BREAK()
+    ENDIF(NOT ${_m}_LOADED)
+  ENDFOREACH(_m)
   SET(QT4_FOUND "1")
 ENDIF(USE_QT4)