Changeset 4211 for trunk

Timestamp:

Mar 10, 2014 10:00:27 AM (10 years ago)

Author:

ldelgass

Message:

More fixes for VTK features. Note that DxToVtk? and PdbToVtk? do not use the
VTK library, and thus can always be built. The DicomToVtk? converter requires
VTK, but does not require the ENABLE_VTK_DICOM option to be set. That option
controls if the external vtkDICOM library is used in addition to VTK.

Location:

trunk/gui/src

Files:

• Makefile.in (modified) (2 diffs)
• RapptureGUI_Init.c (modified) (2 diffs)

trunk/gui/src/Makefile.in

@@ -33 +33 @@
 VTK_VERSION     = @VTK_VERSION@
 VTK_TCL_DIR     = @VTK_TCL_DIR@
+ENABLE_VTK      = @ENABLE_VTK@
 ENABLE_VTK_DICOM= @ENABLE_VTK_DICOM@
 VTK_LIB_SPEC    = 
@@ -60 +61 @@
                 RpCanvPlacard.o \
                 RpDiffview.o \
+                RpDxToVtk.o \
+                RpPdbToVtk.o \
                 RpReadPoints.o \
                 RpListbox.o \
                 RpSqueezer.o
 
-ifneq ($(VTK_TCL_DIR),)
-  OBJS += RpDxToVtk.o RpPdbToVtk.o
+ifeq ($(ENABLE_VTK),yes)
+  OBJS += RpDicomToVtk.o
   VTK_LIB_SPEC += -lvtkIOCore-$(VTK_VERSION) -lvtkIOLegacy-$(VTK_VERSION) -lvtkIOImage-$(VTK_VERSION) -lvtkCommonCore-$(VTK_VERSION)
+  DEFINES      += -DENABLE_VTK
 
   ifeq ($(ENABLE_VTK_DICOM),yes)
-    OBJS += RpDicomToVtk.o
     VTK_LIB_SPEC += -lvtkDICOM
-    DEFINES      += -DUSE_VTK_DICOM_PACKAGE
+    DEFINES      += -DENABLE_VTK_DICOM -DUSE_VTK_DICOM_PACKAGE
   endif
 endif

trunk/gui/src/RapptureGUI_Init.c

@@ -33 +33 @@
 extern Tcl_AppInitProc RpPdbToVtk_Init;
 #ifdef ENABLE_VTK
-#ifdef ENABLE_VTK_DICOM
 extern Tcl_AppInitProc RpDicomToVtk_Init;
-#endif
 #endif
 
@@ -76 +74 @@
     }
 #ifdef ENABLE_VTK
-#ifdef ENABLE_VTK_DICOM
     if (RpDicomToVtk_Init(interp) != TCL_OK) {
         return TCL_ERROR;
     }
 #endif
-#endif
     return TCL_OK;
 }