Changeset 5842 for nanovis


Ignore:
Timestamp:
Aug 22, 2015, 6:11:58 PM (4 years ago)
Author:
ldelgass
Message:

merge r5841 from nanovis trunk

Location:
nanovis/branches/1.2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.2

  • nanovis/branches/1.2/configure

    r5472 r5842  
    13361336  --with-vtk-includes=DIR VTK include files are in DIR
    13371337  --with-vtk-libs=DIR     VTK libraries are in DIR
    1338   --with-vtk=VERSION      Version of VTK required [default=6.1]
     1338  --with-vtk=VERSION      Version of VTK required [default=6.2]
    13391339  --with-ffmpeg=DIR       location of ffmpeg [default=yes]
    13401340  --with-avconv=DIR       location of avconv [default=yes]
     
    47204720# By default, we use our version from the install prefix
    47214721# lib/include directories
    4722 VTK_VERSION=6.1
     4722VTK_VERSION=6.2
    47234723VTK_LIB_DIR=${libdir}
    47244724VTK_INC_DIR=${incdir}
  • nanovis/branches/1.2/configure.in

    r5472 r5842  
    3535    [vtk],
    3636    [AS_HELP_STRING([--with-vtk=VERSION],
    37         [Version of VTK required @<:@default=6.1@:>@])],
     37        [Version of VTK required @<:@default=6.2@:>@])],
    3838    [with_vtk=$withval],
    3939    [with_vtk=""])
     
    170170# By default, we use our version from the install prefix
    171171# lib/include directories
    172 VTK_VERSION=6.1
     172VTK_VERSION=6.2
    173173VTK_LIB_DIR=${libdir}
    174174VTK_INC_DIR=${incdir}
Note: See TracChangeset for help on using the changeset viewer.