Changeset 4598 for vtkvis


Ignore:
Timestamp:
Aug 2, 2014, 1:33:19 AM (5 years ago)
Author:
ldelgass
Message:

Makefile fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • vtkvis/branches/1.7/Makefile.in

    r4040 r4598  
    3131MKDIR_P         = @MKDIR_P@
    3232
    33 SVN_VERSION     = $(shell svnversion $(srcdir))
     33SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3434STATSDIR        = @STATSDIR@
    3535
     
    4040TCL_INC_SPEC    = @TCL_INC_SPEC@
    4141
     42VTK_VERSION     = @VTK_VERSION@
    4243VTK_LIB_DIR     = @VTK_LIB_DIR@
    43 VTK_INC_SPEC    = @VTK_INC_SPEC@
    44 VTK_VERSION     = 6.0
    45 VTK_LIB_SPEC    = \
     44VTK_INC_DIR     = @VTK_INC_DIR@
     45VTK_INC_SPEC    = -I$(VTK_INC_DIR)/vtk-$(VTK_VERSION)
     46VTK_LIB_SPEC    = -L$(VTK_LIB_DIR) \
    4647                -lvtkDomainsChemistry-$(VTK_VERSION) \
    4748                -lvtkIOCore-$(VTK_VERSION) \
     
    7677                -lvtksys-$(VTK_VERSION)
    7778
    78 ifeq ($(VTK_VERSION),6.1)
     79ifeq ($(VTK_VERSION),6.0)
     80VTK_LIB_SPEC += \
     81                -lvtkRenderingHybridOpenGL-$(VTK_VERSION)
     82else
    7983VTK_LIB_SPEC += \
    8084                -lvtkRenderingLIC-$(VTK_VERSION)
    81 else
    82 VTK_LIB_SPEC += \
    83                 -lvtkRenderingHybridOpenGL-$(VTK_VERSION)
    84 endif
    85 
    86 LD_RUN_PATH     = $(libdir)
     85endif
     86
     87LD_RUN_PATH     = $(VTK_LIB_DIR):$(libdir)
    8788
    8889LIBS            = \
     
    99100                $(VTK_INC_SPEC)
    100101
    101 #vtk uses deprecated strstream header (instead of sstream)
    102 EXTRA_CXXFLAGS  = -Wall -Wno-deprecated
     102EXTRA_CXXFLAGS  = -Wall
    103103EXTRA_CFLAGS    = -Wall
    104104DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" -DSTATSDIR=\"$(STATSDIR)\"
Note: See TracChangeset for help on using the changeset viewer.