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

diff --git a/vtk/CMakeLists.txt b/vtk/CMakeLists.txt
index b213ecb0..8456832b 100644
--- a/vtk/CMakeLists.txt
+++ b/vtk/CMakeLists.txt
@@ -3,6 +3,13 @@
 # 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
 INCLUDE(${VTK_USE_FILE})
@@ -13,12 +20,20 @@ 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
+  )
+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 +43,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
@@ -58,6 +77,14 @@ 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,16 +104,30 @@ 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
+#)
+
 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
@@ -98,15 +139,18 @@ TARGET_LINK_LIBRARIES(vtkgdcmSerieViewer2
 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
@@ -123,7 +167,11 @@ 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)