Merge branch 'valgrind_lib' into 'master'

[SPI-1992]: set VALGRIND_LIB depending where shared objects are

See merge request !951

cmake/scripts/create_lcg_view_setup_csh.in

@@ -250,7 +250,9 @@ if ( -e $thisdir/bin/R && $?FC ) then
 endif
 
 #---then Valgrind
-if ( -e $thisdir/bin/valgrind ) then
+if ( -e $thisdir/libexec/valgrind/vgpreload_memcheck-amd64-linux.so ) then
+    setenv VALGRIND_LIB ${thisdir}/libexec/valgrind
+else if ( -e $thisdir/lib/valgrind/vgpreload_memcheck-amd64-linux.so ) then
     setenv VALGRIND_LIB ${thisdir}/lib/valgrind
 endif
 

cmake/scripts/create_lcg_view_setup_sh.in

@@ -227,7 +227,9 @@ if [ -x $thisdir/bin/R ] && [ -n "$FC" ]; then
 fi
 
 #---then Valgrind
-if [ -x $thisdir/bin/valgrind ]; then
+if [ -x $thisdir/libexec/valgrind/vgpreload_memcheck-amd64-linux.so ]; then
+    VALGRIND_LIB=$thisdir/libexec/valgrind; export VALGRIND_LIB
+elif [ -x $thisdir/lib/valgrind/vgpreload_memcheck-amd64-linux.so ]; then
     VALGRIND_LIB=$thisdir/lib/valgrind; export VALGRIND_LIB
 fi