Changeset 4211


Ignore:
Timestamp:
Mar 10, 2014 10:00:27 AM (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/gui/src/Makefile.in

    r4209 r4211  
    3333VTK_VERSION     = @VTK_VERSION@
    3434VTK_TCL_DIR     = @VTK_TCL_DIR@
     35ENABLE_VTK      = @ENABLE_VTK@
    3536ENABLE_VTK_DICOM= @ENABLE_VTK_DICOM@
    3637VTK_LIB_SPEC    =
     
    6061                RpCanvPlacard.o \
    6162                RpDiffview.o \
     63                RpDxToVtk.o \
     64                RpPdbToVtk.o \
    6265                RpReadPoints.o \
    6366                RpListbox.o \
    6467                RpSqueezer.o
    6568
    66 ifneq ($(VTK_TCL_DIR),)
    67   OBJS += RpDxToVtk.o RpPdbToVtk.o
     69ifeq ($(ENABLE_VTK),yes)
     70  OBJS += RpDicomToVtk.o
    6871  VTK_LIB_SPEC += -lvtkIOCore-$(VTK_VERSION) -lvtkIOLegacy-$(VTK_VERSION) -lvtkIOImage-$(VTK_VERSION) -lvtkCommonCore-$(VTK_VERSION)
     72  DEFINES      += -DENABLE_VTK
    6973
    7074  ifeq ($(ENABLE_VTK_DICOM),yes)
    71     OBJS += RpDicomToVtk.o
    7275    VTK_LIB_SPEC += -lvtkDICOM
    73     DEFINES      += -DUSE_VTK_DICOM_PACKAGE
     76    DEFINES      += -DENABLE_VTK_DICOM -DUSE_VTK_DICOM_PACKAGE
    7477  endif
    7578endif
  • trunk/gui/src/RapptureGUI_Init.c

    r4210 r4211  
    3333extern Tcl_AppInitProc RpPdbToVtk_Init;
    3434#ifdef ENABLE_VTK
    35 #ifdef ENABLE_VTK_DICOM
    3635extern Tcl_AppInitProc RpDicomToVtk_Init;
    37 #endif
    3836#endif
    3937
     
    7674    }
    7775#ifdef ENABLE_VTK
    78 #ifdef ENABLE_VTK_DICOM
    7976    if (RpDicomToVtk_Init(interp) != TCL_OK) {
    8077        return TCL_ERROR;
    8178    }
    8279#endif
    83 #endif
    8480    return TCL_OK;
    8581}
Note: See TracChangeset for help on using the changeset viewer.