X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FCMakeLists.txt;h=41023aa2427aaa8895589e59c798efbe0bd06be3;hb=6b17eb062f567984bf36876ddbb980731b603855;hp=c5ab444c99311999cb60c5d711832c7a4fa3b699;hpb=f33a4fa0584a0e784b09743f9786ba6375cd3667;p=gdcm.git

diff --git a/vtk/CMakeLists.txt b/vtk/CMakeLists.txt
index c5ab444c..41023aa2 100644
--- a/vtk/CMakeLists.txt
+++ b/vtk/CMakeLists.txt
@@ -1,5 +1,7 @@
 #-----------------------------------------------------------------------------
 # VTK GDCM Reader subdir
+# Rebuild gdcm whenever a file starting with vtk* is modified
+INCLUDE_REGULAR_EXPRESSION("^vtk.*$")
 
 #-----------------------------------------------------------------------------
 # Include the VTK library
@@ -41,11 +43,31 @@ TARGET_LINK_LIBRARIES(vtkgdcmdemo
 SET(vtkgdcmViewer_SOURCES
   vtkgdcmViewer.cxx
 )
-ADD_EXECUTABLE(vtkgdcmViewer ${vtkgdcmViewer_SOURCES})
+
+# let's do some APPLE/WIN32 magic here
+#IF(WIN32)
+#  SET(GUI_EXECUTABLE WIN32)
+#ENDIF(WIN32)
+IF(APPLE)
+  IF(VTK_USE_CARBON)
+    SET(GUI_EXECUTABLE MACOSX_BUNDLE)
+  ENDIF(VTK_USE_CARBON)
+  IF(VTK_USE_COCOA)
+    SET(GUI_EXECUTABLE MACOSX_BUNDLE)
+  ENDIF(VTK_USE_COCOA)
+  # when using X11 on Apple you don't need this...
+ENDIF(APPLE)
+
+ADD_EXECUTABLE(vtkgdcmViewer ${GUI_EXECUTABLE} ${vtkgdcmViewer_SOURCES})
 TARGET_LINK_LIBRARIES(vtkgdcmViewer
   vtkgdcm
   vtkRendering
 )
+ADD_EXECUTABLE(vtkgdcmViewer2 ${GUI_EXECUTABLE} vtkgdcmViewer2.cxx)
+TARGET_LINK_LIBRARIES(vtkgdcmViewer2
+  vtkgdcm
+  vtkRendering
+)
 
 #-----------------------------------------------------------------------------
 SET(vtkWriteDicom_SOURCES
@@ -58,24 +80,12 @@ TARGET_LINK_LIBRARIES(vtkWriteDicom
   vtkRendering
 )
 
-#-----------------------------------------------------------------------------
-SET(GdcmToBaseline_SOURCES
-  GdcmToBaseline.cxx
-)
-ADD_EXECUTABLE(GdcmToBaseline ${GdcmToBaseline_SOURCES})
-TARGET_LINK_LIBRARIES(GdcmToBaseline
-  vtkgdcm
-  vtkIO
-  vtkImaging
-  vtkRendering
-)
-
 #-----------------------------------------------------------------------------
 # Install vtk header
-INSTALL_FILES(
-  /include FILES vtkGdcmReader.h
-  /include FILES vtkGdcmWriter.h
-)
+INSTALL_FILES(/include/gdcm FILES vtkGdcmReader.h)
+INSTALL_FILES(/include/gdcm FILES vtkGdcmWriter.h)
 
-INSTALL_TARGETS(/lib/vtkgdcm)
+INSTALL_TARGETS(/lib/gdcm/ vtkgdcm)
+INSTALL_TARGETS(/bin/ vtkgdcmViewer)
+INSTALL_TARGETS(/bin/ vtkgdcmViewer2)