Skip to content

Commit b13c255

Browse files
andreasbuhrjwpeterson
authored andcommitted
fix detection of vtk 6.0
vtk in version 6.0 was improperly detected: the test designed for vtk 6.2 was run and failed. This fix changes the code for detecting vtk 6.1 to also match on vtk 6.0
1 parent bcd1823 commit b13c255

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -39292,7 +39292,7 @@ _ACEOF
3929239292
if (test $vtkmajor -eq 5); then
3929339293
VTK_LIBRARY="-L$VTK_LIB -lvtkIO -lvtkCommon -lvtkFiltering -lvtkImaging"
3929439294

39295-
elif (test $vtkmajor -eq 6 -a $vtkminor -eq 1); then
39295+
elif (test $vtkmajor -eq 6 -a $vtkminor -le 1); then
3929639296
VTK_LIBRARY_WITH_VERSION="-L$VTK_LIB -lvtkIOCore-$vtkmajorminor -lvtkCommonCore-$vtkmajorminor -lvtkCommonDataModel-$vtkmajorminor \
3929739297
-lvtkFiltersCore-$vtkmajorminor -lvtkIOXML-$vtkmajorminor -lvtkImagingCore-$vtkmajorminor \
3929839298
-lvtkIOImage-$vtkmajorminor -lvtkImagingMath-$vtkmajorminor"

m4/vtk.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ AC_DEFUN([CONFIGURE_VTK],
164164
VTK_LIBRARY="-L$VTK_LIB -lvtkIO -lvtkCommon -lvtkFiltering -lvtkImaging"
165165
166166
dnl VTK 6.1.x
167-
elif (test $vtkmajor -eq 6 -a $vtkminor -eq 1); then
167+
elif (test $vtkmajor -eq 6 -a $vtkminor -le 1); then
168168
VTK_LIBRARY_WITH_VERSION="-L$VTK_LIB -lvtkIOCore-$vtkmajorminor -lvtkCommonCore-$vtkmajorminor -lvtkCommonDataModel-$vtkmajorminor \
169169
-lvtkFiltersCore-$vtkmajorminor -lvtkIOXML-$vtkmajorminor -lvtkImagingCore-$vtkmajorminor \
170170
-lvtkIOImage-$vtkmajorminor -lvtkImagingMath-$vtkmajorminor"

0 commit comments

Comments
 (0)