From: adam <adam>
Date: Thu, 17 Feb 2011 15:09:23 +0000 (+0000)
Subject: Improve the way VTK in PARAVIEW is detected
X-Git-Tag: Start_BR_19998_21191~65
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1469eeae0ed28d83c99a14765ca6314e57ceb3b1;p=modules%2Fkernel.git

Improve the way VTK in PARAVIEW is detected
---

diff --git a/salome_adm/unix/config_files/check_vtk.m4 b/salome_adm/unix/config_files/check_vtk.m4
index 48cf22f0c..5aac05ddb 100644
--- a/salome_adm/unix/config_files/check_vtk.m4
+++ b/salome_adm/unix/config_files/check_vtk.m4
@@ -172,6 +172,16 @@ if test "x$PVHOME" != "x" ; then
       fi
     done
   fi	
+  if test "x$PVVERSION" = "x" ; then
+    ls -1d $PVHOME/include/paraview-* > /dev/null 2>&1
+    if test $? = 0 ; then
+      nb=$(ls -1d $PVHOME/include/paraview-* | wc -l)
+      if test $nb = 1 ; then
+        d=$(ls -1d $PVHOME/include/paraview-*)
+        PVVERSION=$(echo $d | awk -F "-" '{print $(NF)}')
+      fi
+    fi
+  fi
   if test "x$PVVERSION" = "x" ; then
     PVVERSION=`basename $PVHOME | sed -e "s,[[^-]]*,,"`
   else