Image visualization objects updated

[cpPlugins.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4f2e37e0ef5d5cbc9b60406c5414ede44546a0c..1d6af7523fb31f826af49c1c257f5c6c7556fabc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,38 +42,32 @@ OPTION(BUILD_EXAMPLES "Build examples" OFF)
 
 INCLUDE(GenerateExportHeader)
 
+FIND_PACKAGE(VTK REQUIRED)
 FIND_PACKAGE(ITK REQUIRED)
 INCLUDE(${ITK_USE_FILE})
 
-FIND_PACKAGE(VTK REQUIRED)
-INCLUDE(${VTK_USE_FILE})
+## Check for required modules
+IF(NOT ITKVtkGlue_LOADED)
+  MESSAGE(FATAL_ERROR "ITKVtkGlue module is required but not available.")
+ENDIF(NOT ITKVtkGlue_LOADED)
 
 IF(USE_QT4)
-  IF(NOT WIN32)
-  FIND_LIBRARY(
-    VTK_USES_QT
-    NAMES vtkGUISupportQt-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}
-    HINTS ${VTK_LIBRARY_DIRS}
-    PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64
-    )
-  FIND_LIBRARY(
-    VTK_USES_QT_OPENGL
-    vtkGUISupportQtOpenGL-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}
-    HINTS ${VTK_LIBRARY_DIRS}
-    PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64
-    )
-  MARK_AS_ADVANCED(FORCE VTK_USES_QT)
-  MARK_AS_ADVANCED(FORCE VTK_USES_QT_OPENGL)
-  IF(VTK_USES_QT AND VTK_USES_QT_OPENGL)
-    FIND_PACKAGE(Qt4 REQUIRED)
-    INCLUDE(${QT_USE_FILE})
-  ELSE(VTK_USES_QT AND VTK_USES_QT_OPENGL)
-    MESSAGE(FATAL_ERROR "VTK ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} was not compiled with Qt4 support!")
-  ENDIF(VTK_USES_QT AND VTK_USES_QT_OPENGL)
-  ELSE(NOT WIN32)
-    FIND_PACKAGE(Qt4 REQUIRED)
-    INCLUDE(${QT_USE_FILE})
-  ENDIF(NOT WIN32)
+  FIND_PACKAGE(Qt4 REQUIRED)
+  INCLUDE(${QT_USE_FILE})
+
+  ## Check for required modules
+  IF(NOT vtkGUISupportQt_LOADED)
+    MESSAGE(
+      FATAL_ERROR
+      "vtkGUISupportQt module is required but not available."
+      )
+  ENDIF(NOT vtkGUISupportQt_LOADED)
+  IF(NOT vtkGUISupportQtOpenGL_LOADED)
+    MESSAGE(
+      FATAL_ERROR
+      "vtkGUISupportQtOpenGL module is required but not available."
+      )
+  ENDIF(NOT vtkGUISupportQtOpenGL_LOADED)
 ENDIF(USE_QT4)
 
 ## ================================================