]> Creatis software - clitk.git/commitdiff
Add VTK_LIBRARIES variable for vtk < 5.8.0
authorVivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Wed, 14 Dec 2011 09:07:24 +0000 (10:07 +0100)
committerVivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Wed, 14 Dec 2011 09:07:24 +0000 (10:07 +0100)
Add VTK_LIBRARIES variable for vtk < 5.8.0 and use it.

cmake/dependencies.cmake
tools/CMakeLists.txt

index 225ddccb1bdba22c30df0354347852f2f3028697..078c5a4de21d50e1839019a5e469c3bf8789d4f6 100644 (file)
@@ -13,6 +13,18 @@ ENDIF(ITK_FOUND)
 FIND_PACKAGE(VTK REQUIRED)
 IF(VTK_FOUND)
   INCLUDE("${VTK_USE_FILE}")
+  IF(VTK_VERSION VERSION_LESS 5.8.0)
+    SET ( VTK_LIBRARIES
+      vtkCommon
+      vtkRendering
+      vtkIO
+      vtkFiltering
+      vtkGraphics
+      vtkWidgets
+      vtkImaging
+      vtkHybrid
+      )
+  ENDIF(VTK_VERSION VERSION_LESS 5.8.0)
 ELSE(VTK_FOUND)
   MESSAGE(FATAL_ERROR "Please set VTK_DIR.")
 ENDIF(VTK_FOUND)
index 21a8101be396d3e353d599442d02f996f9c7304b..3c70f5217b228f4c5c90bfe818e192e4c6bbcd31 100644 (file)
@@ -126,7 +126,7 @@ IF (CLITK_BUILD_TOOLS)
 
   WRAP_GGO(clitkGammaIndex_GGO_C clitkGammaIndex.ggo)
   ADD_EXECUTABLE(clitkGammaIndex clitkGammaIndex.cxx ${clitkGammaIndex_GGO_C})
-  TARGET_LINK_LIBRARIES(clitkGammaIndex clitkCommon ${VTK_LIBRARIES} ${ITK_LIBRARIES} vtkIO)
+  TARGET_LINK_LIBRARIES(clitkGammaIndex clitkCommon ${VTK_LIBRARIES} ${ITK_LIBRARIES})
   SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkGammaIndex)
 
   ADD_EXECUTABLE(clitkImageArithm clitkImageArithm.cxx)
@@ -368,21 +368,17 @@ IF (CLITK_BUILD_TOOLS)
 
     WRAP_GGO(clitkBinaryImageToMesh_GGO_C clitkBinaryImageToMesh.ggo)
     ADD_EXECUTABLE(clitkBinaryImageToMesh clitkBinaryImageToMesh.cxx ${clitkBinaryImageToMesh_GGO_C})
-    TARGET_LINK_LIBRARIES(clitkBinaryImageToMesh ${ITK_LIBRARIES} vtkCommon vtkRendering)
+    TARGET_LINK_LIBRARIES(clitkBinaryImageToMesh ${ITK_LIBRARIES} ${VTK_LIBRARIES})
     SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkBinaryImageToMesh)
 
     WRAP_GGO(clitkMeshToBinaryImage_GGO_C clitkMeshToBinaryImage.ggo)
     ADD_EXECUTABLE(clitkMeshToBinaryImage clitkMeshToBinaryImage.cxx ${clitkMeshToBinaryImage_GGO_C})
-    IF(VTK_VERSION VERSION_LESS 5.8.0)
-      TARGET_LINK_LIBRARIES(clitkMeshToBinaryImage clitkCommon ${ITK_LIBRARIES} vtkHybrid vtkIO)
-    ELSE(VTK_VERSION VERSION_LESS 5.8.0)
-      TARGET_LINK_LIBRARIES(clitkMeshToBinaryImage clitkCommon ${ITK_LIBRARIES} ${VTK_LIBRARIES})
-    ENDIF(VTK_VERSION VERSION_LESS 5.8.0)
+    TARGET_LINK_LIBRARIES(clitkMeshToBinaryImage clitkCommon ${ITK_LIBRARIES} ${VTK_LIBRARIES})
     SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMeshToBinaryImage)
 
     WRAP_GGO(clitkMeshViewer_GGO_C clitkMeshViewer.ggo)
     ADD_EXECUTABLE(clitkMeshViewer clitkMeshViewer.cxx ${clitkMeshViewer_GGO_C})
-    TARGET_LINK_LIBRARIES(clitkMeshViewer vtkCommon vtkRendering)
+    TARGET_LINK_LIBRARIES(clitkMeshViewer ${VTK_LIBRARIES})
     SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMeshViewer)
   ENDIF(CLITK_EXPERIMENTAL)