BUG: resultPath could be empty, cannot access char -1 in an array

[gdcm.git] / vtk / CMakeLists.txt

diff --git a/vtk/CMakeLists.txt b/vtk/CMakeLists.txt
index ff88f670e2cc2cd4fa575436342a28fdb348b9e1..e5ee62fa22290dec3583ed67051b666e7d71bfa6 100644 (file)
--- a/vtk/CMakeLists.txt
+++ b/vtk/CMakeLists.txt
@@ -45,9 +45,9 @@ SET(vtkgdcmViewer_SOURCES
 )
 
 # let's do some APPLE/WIN32 magic here
-IF(WIN32)
-  SET(GUI_EXECUTABLE WIN32)
-ENDIF(WIN32)
+#IF(WIN32)
+#  SET(GUI_EXECUTABLE WIN32)
+#ENDIF(WIN32)
 IF(APPLE)
   IF(VTK_USE_CARBON)
     SET(GUI_EXECUTABLE MACOSX_BUNDLE)
@@ -68,24 +68,48 @@ 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
+  vtkIO
+  vtkRendering
+)
 #-----------------------------------------------------------------------------
 # Install vtk header
-INSTALL_FILES(/include/gdcm FILES vtkGdcmReader.h)
-INSTALL_FILES(/include/gdcm FILES vtkGdcmWriter.h)
+IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+  INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcmReader.h)
+  INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcmWriter.h)
+ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
 
-INSTALL_TARGETS(/lib/gdcm/ vtkgdcm)
-INSTALL_TARGETS(/bin/ vtkgdcmViewer)
-INSTALL_TARGETS(/bin/ vtkgdcmViewer2)
+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} vtkgdcmSerieViewer)
+ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)