Changeset 5842

Timestamp:

Aug 22, 2015 3:11:58 PM (8 years ago)

Author:

ldelgass

Message:

merge r5841 from nanovis trunk

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• configure (modified) (2 diffs)
• configure.in (modified) (2 diffs)

nanovis/branches/1.2/configure

@@ -1336 +1336 @@
   --with-vtk-includes=DIR VTK include files are in DIR
   --with-vtk-libs=DIR     VTK libraries are in DIR
-  --with-vtk=VERSION      Version of VTK required [default=6.1]
+  --with-vtk=VERSION      Version of VTK required [default=6.2]
   --with-ffmpeg=DIR       location of ffmpeg [default=yes]
   --with-avconv=DIR       location of avconv [default=yes]
@@ -4720 +4720 @@
 # By default, we use our version from the install prefix
 # lib/include directories
-VTK_VERSION=6.1
+VTK_VERSION=6.2
 VTK_LIB_DIR=${libdir}
 VTK_INC_DIR=${incdir}

nanovis/branches/1.2/configure.in

@@ -35 +35 @@
     [vtk],
     [AS_HELP_STRING([--with-vtk=VERSION],
-        [Version of VTK required @<:@default=6.1@:>@])],
+        [Version of VTK required @<:@default=6.2@:>@])],
     [with_vtk=$withval],
     [with_vtk=""])
@@ -170 +170 @@
 # By default, we use our version from the install prefix
 # lib/include directories
-VTK_VERSION=6.1
+VTK_VERSION=6.2
 VTK_LIB_DIR=${libdir}
 VTK_INC_DIR=${incdir}