X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FCMakeLists.txt;h=a474e3a27a2acc2d226f75ca93cc47e6e49b02fd;hb=refs%2Fheads%2Fmaster;hp=5816bcb15b6eef1164915c8bf5167dc7c3b0340f;hpb=4b43cc3729743fcf7632e055cabd3f564d1bbe0b;p=gdcm.git

diff --git a/vtk/CMakeLists.txt b/vtk/CMakeLists.txt
index 5816bcb1..a474e3a2 100644
--- a/vtk/CMakeLists.txt
+++ b/vtk/CMakeLists.txt
@@ -3,7 +3,6 @@
 # Rebuild gdcm whenever a file starting with vtk* is modified
 INCLUDE_REGULAR_EXPRESSION("^vtk.*$")
 
-
      if(COMMAND cmake_policy)
        cmake_policy(SET CMP0003 NEW)
      endif(COMMAND cmake_policy)
@@ -25,20 +24,19 @@ INCLUDE_DIRECTORIES(
 # Depending on VTK version build more stuff:
 IF("${VTK_MAJOR_VERSION}" GREATER 4)
   SET(VTKGDCM_LIB_SRCS
-    vtkGdcmReader.cxx 
-    vtkGdcmWriter.cxx 
-    vtkImageColorViewer.cxx 
-    vtkImageMapToWindowLevelColors2.cxx 
-    vtkGdcm4DSplitter.cxx 
+    vtkGdcmReader.cxx
+    vtkGdcmWriter.cxx
+    vtkImageColorViewer.cxx
+    vtkImageMapToWindowLevelColors2.cxx
+    vtkGdcm4DSplitter.cxx
   )
 ELSE("${VTK_MAJOR_VERSION}" GREATER 4)
   SET(VTKGDCM_LIB_SRCS
-    vtkGdcmReader.cxx 
-    vtkGdcmWriter.cxx 
+    vtkGdcmReader.cxx
+    vtkGdcmWriter.cxx
   )
 ENDIF("${VTK_MAJOR_VERSION}" GREATER 4)
 
-
 #-----------------------------------------------------------------------------
 # Create vtkgdcm library
 ADD_LIBRARY(vtkgdcm ${VTKGDCM_LIB_SRCS})
@@ -99,13 +97,9 @@ SET(vtkgdcmViewer_SOURCES
   vtkgdcmViewer.cxx
 )
 
-#SET(vtkJPEGViewer_SOURCES
-#  vtkJPEGViewer.cxx
-#)
-
-#SET(vtkJPEGViewer2_SOURCES
-#  vtkJPEGViewer2.cxx
-#)
+SET(vtkgdcmViewer2_SOURCES
+  vtkgdcmViewer2.cxx
+)
 
 # let's do some APPLE/WIN32 magic here
 #IF(WIN32)
@@ -145,8 +139,10 @@ SET(test4DSplitter_SOURCES
 
 ADD_EXECUTABLE(test4DSplitter ${GUI_EXECUTABLE} ${test4DSplitter_SOURCES})
 TARGET_LINK_LIBRARIES( test4DSplitter
-  vtkgdcm 
+  vtkgdcm
+  vtkRendering
 )
+
 #-----------------------------------------------------------------------------
 #SET(testEmilie1_SOURCES
 #  testEmilie1.cxx
@@ -203,7 +199,7 @@ TARGET_LINK_LIBRARIES(vtkWriteDicomExtended
 IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
   INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcmReader.h)
   INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcmWriter.h)
-  INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcm4DSplitter.h)  
+  INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcm4DSplitter.h)
 ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
 
 IF(NOT GDCM_INSTALL_NO_LIBRARIES)