X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vtk%2FCMakeLists.txt;h=892971eddb89fda7162db538aa43428ad6a61e3d;hb=76ac46b16fd92d0fb444f786d4946424d9029315;hp=b213ecb0200338aee397bf0888a57b898faa0f09;hpb=f750b420182687170c60f12494c4651cf430b183;p=gdcm.git

diff --git a/vtk/CMakeLists.txt b/vtk/CMakeLists.txt
index b213ecb0..892971ed 100644
--- a/vtk/CMakeLists.txt
+++ b/vtk/CMakeLists.txt
@@ -3,8 +3,17 @@
 # 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)
+
 #-----------------------------------------------------------------------------
 # Include the VTK library
+
+# EED 5/Mars/2010
+SET(VTK_BUILD_SETTINGS_FILE OFF)
+
 INCLUDE(${VTK_USE_FILE})
 
 # Need gdcm header files
@@ -13,12 +22,21 @@ INCLUDE_DIRECTORIES(
   ${GDCM_BINARY_DIR}/
 )
 
-SET(VTKGDCM_LIB_SRCS
-  vtkGdcmReader.cxx
-  vtkGdcmWriter.cxx
-  vtkImageColorViewer.cxx
-  vtkImageMapToWindowLevelColors2.cxx
-)
+# 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
+  )
+ELSE("${VTK_MAJOR_VERSION}" GREATER 4)
+  SET(VTKGDCM_LIB_SRCS
+    vtkGdcmReader.cxx
+    vtkGdcmWriter.cxx
+  )
+ENDIF("${VTK_MAJOR_VERSION}" GREATER 4)
 
 #-----------------------------------------------------------------------------
 # Create vtkgdcm library
@@ -28,8 +46,12 @@ TARGET_LINK_LIBRARIES(vtkgdcm
   vtkCommon
   vtkIO
   vtkFiltering
-  vtkRendering
 )
+IF("${VTK_MAJOR_VERSION}" GREATER 4)
+  TARGET_LINK_LIBRARIES(vtkgdcm
+    vtkRendering
+  )
+ENDIF("${VTK_MAJOR_VERSION}" GREATER 4)
 
 #-----------------------------------------------------------------------------
 SET(vtkgdcmdemo_SOURCES
@@ -46,18 +68,44 @@ TARGET_LINK_LIBRARIES(vtkgdcmdemo
 SET(Bmp2Dcm_SOURCES
   Bmp2Dcm.cxx
 )
+
 ADD_EXECUTABLE(Bmp2Dcm ${Bmp2Dcm_SOURCES})
 TARGET_LINK_LIBRARIES(Bmp2Dcm
   vtkgdcm
   vtkImaging
-
 )
 
+#-----------------------------------------------------------------------------
+#ADD_EXECUTABLE(exUnMosaic2 exUnMosaic2.cxx)
+#TARGET_LINK_LIBRARIES(exUnMosaic2
+#  vtkgdcm
+  ##vtkRendering
+#)
+
+#ADD_EXECUTABLE(exUnMosaic3 exUnMosaic3.cxx)
+#TARGET_LINK_LIBRARIES(exUnMosaic3
+#  vtkgdcm
+#  #vtkRendering
+#)
+
+#ADD_EXECUTABLE(exUnMosaic4 exUnMosaic4.cxx)
+#TARGET_LINK_LIBRARIES(exUnMosaic4
+#  vtkgdcm
+#  #vtkRendering
+#)
 #-----------------------------------------------------------------------------
 SET(vtkgdcmViewer_SOURCES
   vtkgdcmViewer.cxx
 )
 
+#SET(vtkJPEGViewer_SOURCES
+#  vtkJPEGViewer.cxx
+#)
+
+#SET(vtkJPEGViewer2_SOURCES
+#  vtkJPEGViewer2.cxx
+#)
+
 # let's do some APPLE/WIN32 magic here
 #IF(WIN32)
 #  SET(GUI_EXECUTABLE WIN32)
@@ -77,36 +125,72 @@ TARGET_LINK_LIBRARIES(vtkgdcmViewer
   vtkgdcm
   vtkRendering
 )
+
+#ADD_EXECUTABLE(vtkJPEGViewer ${GUI_EXECUTABLE} ${vtkJPEGViewer_SOURCES})
+#TARGET_LINK_LIBRARIES( vtkJPEGViewer
+#  vtkRendering
+#)
+
+#ADD_EXECUTABLE(vtkJPEGViewer2 ${GUI_EXECUTABLE} ${vtkJPEGViewer2_SOURCES})
+#TARGET_LINK_LIBRARIES( vtkJPEGViewer2
+#  vtkgdcm
+#  vtkRendering
+#)
+
+#-----------------------------------------------------------------------------
+SET(test4DSplitter_SOURCES
+  test4DSplitter.cxx
+)
+
+ADD_EXECUTABLE(test4DSplitter ${GUI_EXECUTABLE} ${test4DSplitter_SOURCES})
+TARGET_LINK_LIBRARIES( test4DSplitter
+  vtkgdcm 
+)
+#-----------------------------------------------------------------------------
+#SET(testEmilie1_SOURCES
+#  testEmilie1.cxx
+#)
+#
+#ADD_EXECUTABLE(testEmilie1 ${GUI_EXECUTABLE} ${testEmilie1_SOURCES})
+#TARGET_LINK_LIBRARIES( testEmilie1
+#  vtkgdcm 
+#)
+#-----------------------------------------------------------------------------
+
 ADD_EXECUTABLE(vtkgdcmViewer2 ${GUI_EXECUTABLE} vtkgdcmViewer2.cxx)
 TARGET_LINK_LIBRARIES(vtkgdcmViewer2
   vtkgdcm
   vtkRendering
 )
+
 ADD_EXECUTABLE(vtkgdcmSerieViewer ${GUI_EXECUTABLE} vtkgdcmSerieViewer.cxx)
 TARGET_LINK_LIBRARIES(vtkgdcmSerieViewer
   vtkgdcm
   vtkRendering
 )
+
 ADD_EXECUTABLE(vtkgdcmSerieViewer2 ${GUI_EXECUTABLE} vtkgdcmSerieViewer2.cxx)
 TARGET_LINK_LIBRARIES(vtkgdcmSerieViewer2
   vtkgdcm
   vtkRendering
 )
 
-
 #-----------------------------------------------------------------------------
 SET(vtkWriteDicom_SOURCES
   vtkWriteDicom.cxx
 )
+
 SET(vtkWriteDicomExtended_SOURCES
   vtkWriteDicomExtended.cxx  
 )
+
 ADD_EXECUTABLE(vtkWriteDicom ${vtkWriteDicom_SOURCES})
 TARGET_LINK_LIBRARIES(vtkWriteDicom
   vtkgdcm
   vtkIO
   vtkRendering
 )
+
 ADD_EXECUTABLE(vtkWriteDicomExtended ${vtkWriteDicomExtended_SOURCES})
 TARGET_LINK_LIBRARIES(vtkWriteDicomExtended
   vtkgdcm
@@ -118,12 +202,17 @@ 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)  
 ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
 
 IF(NOT GDCM_INSTALL_NO_LIBRARIES)
   INSTALL_TARGETS(${GDCM_INSTALL_LIB_DIR} vtkgdcm)
   INSTALL_TARGETS(${GDCM_INSTALL_BIN_DIR} vtkgdcmViewer)
-  INSTALL_TARGETS(${GDCM_INSTALL_BIN_DIR} vtkgdcmViewer2)
+  INSTALL_TARGETS(${GDCM_INSTALL_BIN_DIR} vtkgdcmViewer)
+
+ # INSTALL_TARGETS(${GDCM_INSTALL_BIN_DIR} vtkJPEGViewer)
+ # INSTALL_TARGETS(${GDCM_INSTALL_BIN_DIR} vtkJPEGViewer2)
+
   INSTALL_TARGETS(${GDCM_INSTALL_BIN_DIR} vtkgdcmSerieViewer)
 ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)