Changeset 5840


Ignore:
Timestamp:
Aug 22, 2015 3:07:32 PM (9 years ago)
Author:
ldelgass
Message:

merge r5839 from vtkvis trunk

Location:
vtkvis/branches/1.8
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • vtkvis/branches/1.8

  • vtkvis/branches/1.8/configure

    r5748 r5840  
    13231323  --with-vtk-includes=DIR location of versioned VTK include dir
    13241324  --with-vtk-libs=DIR     VTK libraries are in DIR
    1325   --with-vtk=VERSION      Version of VTK required [default=6.1]
     1325  --with-vtk=VERSION      Version of VTK required [default=6.2]
    13261326  --with-statsdir=DIR     Write statistics in DIR
    13271327
     
    41454145
    41464146# There can be multiple versions of VTK installed side-by-side
    4147 VTK_VERSION=6.1
     4147VTK_VERSION=6.2
    41484148VTK_LIB_DIR=${libdir}
    41494149VTK_INC_DIR=${incdir}
  • vtkvis/branches/1.8/configure.in

    r5748 r5840  
    2727    [vtk],
    2828    [AS_HELP_STRING([--with-vtk=VERSION],
    29         [Version of VTK required @<:@default=6.1@:>@])],
     29        [Version of VTK required @<:@default=6.2@:>@])],
    3030    [with_vtk=$withval],
    3131    [with_vtk=""])
     
    104104
    105105# There can be multiple versions of VTK installed side-by-side
    106 VTK_VERSION=6.1
     106VTK_VERSION=6.2
    107107VTK_LIB_DIR=${libdir}
    108108VTK_INC_DIR=${incdir}
Note: See TracChangeset for help on using the changeset viewer.