Changeset 4598

Timestamp:

Aug 1, 2014, 10:33:19 PM (10 years ago)

Author:

ldelgass

Message:

Makefile fixes

File:

• vtkvis/branches/1.7/Makefile.in (modified) (4 diffs)

vtkvis/branches/1.7/Makefile.in

@@ -31 +31 @@
 MKDIR_P         = @MKDIR_P@
 
-SVN_VERSION     = $(shell svnversion $(srcdir))
+SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
 STATSDIR        = @STATSDIR@
 
@@ -40 +40 @@
 TCL_INC_SPEC    = @TCL_INC_SPEC@
 
+VTK_VERSION     = @VTK_VERSION@
 VTK_LIB_DIR     = @VTK_LIB_DIR@
-VTK_INC_SPEC    = @VTK_INC_SPEC@
-VTK_VERSION     = 6.0
-VTK_LIB_SPEC    = \
+VTK_INC_DIR     = @VTK_INC_DIR@
+VTK_INC_SPEC    = -I$(VTK_INC_DIR)/vtk-$(VTK_VERSION)
+VTK_LIB_SPEC    = -L$(VTK_LIB_DIR) \
                 -lvtkDomainsChemistry-$(VTK_VERSION) \
                 -lvtkIOCore-$(VTK_VERSION) \
@@ -76 +77 @@
                 -lvtksys-$(VTK_VERSION)
 
-ifeq ($(VTK_VERSION),6.1)
+ifeq ($(VTK_VERSION),6.0)
+VTK_LIB_SPEC += \
+                -lvtkRenderingHybridOpenGL-$(VTK_VERSION)
+else
 VTK_LIB_SPEC += \
                 -lvtkRenderingLIC-$(VTK_VERSION)
-else
-VTK_LIB_SPEC += \
-                -lvtkRenderingHybridOpenGL-$(VTK_VERSION)
-endif
-
-LD_RUN_PATH     = $(libdir)
+endif
+
+LD_RUN_PATH     = $(VTK_LIB_DIR):$(libdir)
 
 LIBS            = \
@@ -99 +100 @@
                 $(VTK_INC_SPEC)
 
-#vtk uses deprecated strstream header (instead of sstream)
-EXTRA_CXXFLAGS  = -Wall -Wno-deprecated
+EXTRA_CXXFLAGS  = -Wall
 EXTRA_CFLAGS    = -Wall
 DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" -DSTATSDIR=\"$(STATSDIR)\"