Salome HOME
Update pre-requisites for SALOME 7.4.0
[tools/install.git] / config_files / ParaView.sh
index d98655ff622355a2c1b8c9dd1d24146497d746ef..02a3e699fceb3a5b2b29257b4d2e310ff989365f 100755 (executable)
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2012 CEA
+#  Copyright : 2002-2014 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 #
 # Paraview version and lib version
 #
-PVVERSION=3.14.0
-PVLIBVERSION=`echo ${PVVERSION} | awk -F. '{printf("%d.%d",$1,$2)}'`
+VERSION_PARAVIEW=4.1.0
+PVLIBVERSION=`echo ${VERSION_PARAVIEW} | awk -F. '{printf("%d.%d",$1,$2)}'`
 
 check_version()
 {
-if [ -z "$PARAVIEW" ]; then
+if [ -z "${PARAVIEW_ROOT_DIR}" ]; then
    return 1 
 fi
-check_lib_version libvtkCommon.so ${PVHOME}/lib/paraview-${PVLIBVERSION}
+check_lib_version libvtkCommonCore-pv${PVLIBVERSION}.so ${PARAVIEW_ROOT_DIR}/lib/paraview-${PVLIBVERSION}
 if [ "$?" -eq "0" ]; then
    return 0
 fi
@@ -33,13 +33,13 @@ return 1
 print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export PVHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${PVHOME}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${PVHOME}/lib/paraview-${PVLIBVERSION}:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${PVHOME}/lib/paraview-${PVLIBVERSION}:\${PVHOME}/lib/paraview-${PVLIBVERSION}/site-packages:\${PVHOME}/lib/paraview-${PVLIBVERSION}/site-packages/paraview:\${PYTHONPATH}
-export VTK_DIR=\${PVHOME}/lib/paraview-${PVLIBVERSION}
-export PV_PLUGIN_PATH=\${PVHOME}/lib/paraview-${PVLIBVERSION}
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
+export PARAVIEW_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export VTK_DIR=\${PARAVIEW_ROOT_DIR}/lib/cmake/paraview-${PVLIBVERSION}
+export PV_PLUGIN_PATH=\${PARAVIEW_ROOT_DIR}/lib/paraview-${PVLIBVERSION}
+export PATH=\${PARAVIEW_ROOT_DIR}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${PARAVIEW_ROOT_DIR}/lib/paraview-${PVLIBVERSION}:\${LD_LIBRARY_PATH}
+export PYTHONPATH=\${PARAVIEW_ROOT_DIR}/lib/paraview-${PVLIBVERSION}:\${PARAVIEW_ROOT_DIR}/lib/paraview-${PVLIBVERSION}/site-packages:\${PARAVIEW_ROOT_DIR}/lib/paraview-${PVLIBVERSION}/site-packages/paraview:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -49,7 +49,7 @@ make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}
 print_env_src()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
+#${DELIM} ${PRODUCT_TYPE}_src ${DELIM}
 # nothing to do
 ##
 EOF
@@ -66,44 +66,53 @@ return $?
 install_source()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-data_archive=${SOURCE_DIR}/ParaViewData-${PVVERSION}.tar.gz
+data_archive=${SOURCE_DIR}/ParaViewData-${VERSION_PARAVIEW}.tar.gz
 if [ ! -f ${data_archive} ] ; then
     data_archive=${SOURCE_DIR}/ParaViewData-${PVLIBVERSION}.tar.gz
 fi
-check_jb tar xfz ${data_archive} -C ${INST_ROOT}
+if [ -f ${data_archive} ] ; then
+    check_jb tar xfz ${data_archive} -C ${INST_ROOT}
+fi
 
 ### patch paraview
-# 1. patch for ParaViewLibraryDepends.cmake problem (ParaView 3.10.0) [OBSOLETE (fixed in 3.10.1)]
-need_patch_depend=0
-if [ "${need_patch_depend}" == "1" ] && [ -f patches/paraview-3.10.0-depend.patch ] ; then
-    cp patches/paraview-3.10.0-depend.patch ${PRODUCT_SRC_DIR}
-    ( cd ${PRODUCT_SRC_DIR} ; patch -p0 < paraview-3.10.0-depend.patch )
+# 1. fix missing library dependencies
+local patch_lib_depends=0
+if [ "${patch_lib_depends}" = "1" ] ; then
+    echo "target_link_libraries(vtkWrappingPython pthread util)" >> ${PRODUCT_SRC_DIR}/VTK/Wrapping/Python/CMakeLists.txt
+    sed -i "s%LINK_PUBLIC vtkPVServerManagerCore%LINK_PUBLIC vtkPVServerManagerCore util%g" ${PRODUCT_SRC_DIR}/ParaViewCore/ServerManager/SMApplication/CMakeLists.txt
+    sed -i "s%VTK_PYTHON_LIBRARIES})%VTK_PYTHON_LIBRARIES} pthread util)%g" ${PRODUCT_SRC_DIR}/ParaViewCore/PythonSupport/CMakeLists.txt
+    sed -i "s%PYTHON_UTIL_LIBRARY_LIB}%PYTHON_UTIL_LIBRARY_LIB} pthread dl%g" ${PRODUCT_SRC_DIR}/ThirdParty/QtTesting/vtkqttesting/CMakeLists.txt
 fi
-# 2. patch for missing PyVTKMutableObject.h (ParaView 3.10 development version) [OBSOLETE (fixed in 3.10.1)]
-need_patch_mutable=0
-if [ "${need_patch_mutable}" == "1" ] ; then
-    ( cd ${PRODUCT_SRC_DIR} && grep "PyVTKMutableObject.h" VTK/Wrapping/Python/CMakeLists.txt >& /dev/null || \
-       sed -i "s%\([[:space:]]*\)PyVTKSpecialObject.h%\1PyVTKSpecialObject.h\n\1PyVTKMutableObject.h%g" \
-       VTK/Wrapping/Python/CMakeLists.txt )
+# 2. fix problem with SurfaceLIC plugin
+local patch_surface_lic=1
+if [ "${patch_surface_lic}" = "1" -a -f ${SRCDIR}/patches/surface_lic.png ] ; then
+    cp -f ${SRCDIR}/patches/surface_lic.png ${PRODUCT_SRC_DIR}/Plugins/SurfaceLIC/doc
 fi
-# 3. patch for ftgl (incompatibility with OCCT 6.5) [OBSOLETE (fixed in 3.12.0)]
-need_patch_ftgl=0
-if [ "${need_patch_ftgl}" == "1" ] ; then
-    cp patches/paraview-3.10.1-ftgl.patch ${PRODUCT_SRC_DIR}
-    ( cd ${PRODUCT_SRC_DIR} ; patch -p1 < paraview-3.10.1-ftgl.patch )
+# 3. fix about missing TopologicalSort.cmake
+local patch_topological_sort=1
+if [ "${patch_topological_sort}" = "1" ] ; then
+    sed -i "s%CMake/vtkWrapTcl.cmake%CMake/vtkWrapTcl.cmake\n\t\tCMake/TopologicalSort.cmake%" ${PRODUCT_SRC_DIR}/VTK/CMake/vtkModuleTop.cmake
 fi
-# 4. patch hang-up of the compiler on some platforms when building SurfaceLIC plug-in (v3.14.0)
-need_patch_surfaceLic=1
-if [ "${need_patch_surfaceLic}" == "1" ] ; then
-    ( test -f patches/surface_lic.png && cp -f patches/surface_lic.png ${PRODUCT_SRC_DIR}/Plugins/SurfaceLIC/doc )
+# 4. fix about missing header files
+local patch_missing_headers=1
+if [ "${patch_missing_headers}" = "1" ] ; then
+       cat >> ${PRODUCT_SRC_DIR}/Qt/Components/CMakeLists.txt <<EOF
+IF (PARAVIEW_INSTALL_DEVELOPMENT_FILES)
+  FILE(GLOB files RELATIVE \${CMAKE_CURRENT_SOURCE_DIR} *.h)
+  INSTALL(
+        FILES \${files}
+        DESTINATION \${VTK_INSTALL_INCLUDE_DIR}
+        COMPONENT Development)
+ENDIF (PARAVIEW_INSTALL_DEVELOPMENT_FILES)
+EOF
 fi
-# 5. patch for missing doc generation files (v3.14.0)
-need_patch_plugindoc=1
-if [ "${need_patch_plugindoc}" == "1" ] ; then
-    ( test -f patches/paraview-3.14.0-plugindoc.patch && cp -f patches/paraview-3.14.0-plugindoc.patch ${PRODUCT_SRC_DIR} && cd ${PRODUCT_SRC_DIR} && patch -p1 < paraview-3.14.0-plugindoc.patch )
+# 5. fix pb with dynamic loader in SALOME
+local patch_dlopen=1
+if [ "${patch_dlopen}" = "1" ] ; then
+    sed -i "s%RTLD_LAZY%RTLD_LAZY|RTLD_NODELETE%g" ${PRODUCT_SRC_DIR}/VTK/Utilities/KWSys/vtksys/DynamicLoader.cxx
 fi
 
 # to generate environment scripts
@@ -131,115 +140,122 @@ tcldir="`where_tcl`"
 if [ $? -eq 0 ] && [ -e ${tcldir}/tclConfig.sh ] ; then
     tcl_version=`grep -e "TCL_VERSION=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_VERSION=[\'|\"]\(.*\)[\'|\"]%\1%g" | sed -e "s%^[[:space:]]%%g;s%[[:space:]]\+$%%g"`
     tcl_includes=`grep -e "TCL_INCLUDE_SPEC=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_INCLUDE_SPEC=[\'|\"]-I\(.*\)[\'|\"]%\1%g" | sed -e "s%^[[:space:]]%%g;s%[[:space:]]\+$%%g"`
-    if [ -z "$tcl_includes" ] ; then tcl_includes=/usr/include ; fi
+    if [ -z "${tcl_includes}" ] ; then tcl_includes=/usr/include ; fi
     tcl_libs=`grep -e "TCL_PACKAGE_PATH=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_PACKAGE_PATH=[\'|\"]\(.*\)[\'|\"]%\1%g" | sed -e "s%^[[:space:]]%%g;s%[[:space:]]\+$%%g"`
 fi
 
 CMAKE_OPTIONS=""
 
 ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-
-### compiler settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR}"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DBUILD_SHARED_LIBS:BOOL=ON"
+
+### general compiler settings
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+
 ### compiler settings for 64 bit platforms
 if test `uname -m` = "x86_64" ; then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DCMAKE_CXX_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DCMAKE_C_FLAGS:STRING=-m64"
 fi
 
 ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
 
 ### VTK general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_HYBRID:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_GL2PS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_PARALLEL:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_PATENTED:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_RENDERING:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"
+#CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_LEGACY_REMOVE:BOOL=OFF"
+#CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_USE_HYBRID:BOOL=ON"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_USE_PARALLEL:BOOL=ON"
+#CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_USE_PATENTED:BOOL=OFF"
+#CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_USE_RENDERING:BOOL=ON"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_USE_64BIT_IDS:BOOL=OFF"
 
 ### Qt settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_QT_USE_WEBKIT:BOOL=ON"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+#CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_QT_USE_WEBKIT:BOOL=ON"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DQT_TESTING_INSTALL_DEVELOPMENT:BOOL=ON"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DQT_HELP_GENERATOR:STRING=${QT4_ROOT_DIR}/bin/qhelpgenerator"
 
 ### Python settings
 if [ "${python_version}" != "" ]; then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONROOT}/bin/python${python_version}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONROOT}/include/python${python_version}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONROOT}/lib/python${python_version}/config/libpython${python_version}.a"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_WRAP_PYTHON:BOOL=ON"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPYTHON_USE_STATIC_LIBRARIES:BOOL=OFF"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/python${python_version}"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPYTHON_INCLUDE_PATH:STRING=${PYTHON_ROOT_DIR}/include/python${python_version}"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/python${python_version}/config/libpython${python_version}.so"
 fi
 
 ### Tcl/Tk settings
+#
+# TEMPORARILY DISABLE TCL WRAPPINGS DUE TO BUG IN PARAVIEW WRAPPER UTILITY!
+#--->
+if false ; then
+#<---
 if [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}" != "" ] ; then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${tcl_includes}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${tcl_libs}/libtcl${tcl_version}.so"
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${tcl_libs}/libtclstub${tcl_version}.a"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTCL_TCLSH:STRING=${TCLHOME}/bin/tclsh${tcl_version}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTK_INCLUDE_PATH:STRING=${tcl_includes}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${tcl_libs}/libtk${tcl_version}.so"
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${tcl_libs}/libtkstub${tcl_version}.a"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish${tcl_version}"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_WRAP_TCL:BOOL=ON"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DTCL_INCLUDE_PATH:STRING=${tcl_includes}"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DTCL_LIBRARY:STRING=${tcl_libs}/libtcl${tcl_version}.so"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DTCL_STUB_LIBRARY:STRING=${tcl_libs}/libtclstub${tcl_version}.a"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DTCL_TCLSH:STRING=${TCLHOME}/bin/tclsh${tcl_version}"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DTK_INCLUDE_PATH:STRING=${tcl_includes}"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DTK_LIBRARY:STRING=${tcl_libs}/libtk${tcl_version}.so"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DTK_STUB_LIBRARY:STRING=${tcl_libs}/libtkstub${tcl_version}.a"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DTK_WISH:STRING=${TCLHOME}/bin/wish${tcl_version}"
+else
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_WRAP_TCL:BOOL=OFF"
 fi
+#--->
+fi
+#<---
 
 ### HDF5 settings
-if [ "${HDF5HOME}" != "" ]; then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_INCLUDE_DIR:STRING=${HDF5HOME}/include"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_LIBRARY:STRING=${HDF5HOME}/lib/libhdf5.so"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=OFF"
+if [ "${HDF5_ROOT_DIR}" != "" ]; then
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DHDF5_ROOT:PATH=${HDF5_ROOT_DIR}"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DHDF5_INCLUDE_DIRS=${HDF5_ROOT_DIR}/include"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DHDF5_LIBRARIES=${HDF5_ROOT_DIR}/lib/libhdf5.so;${HDF5_ROOT_DIR}/lib/libhdf5_hl.so"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DHDF5_INCLUDE_DIR:PATH=${HDF5_ROOT_DIR}/include"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DHDF5_HL_INCLUDE_DIR:PATH=${HDF5_ROOT_DIR}/include"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DHDF5_LIBRARY_DIRS=${HDF5_ROOT_DIR}/lib"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DHDF5_LIBRARY:PATH=${HDF5_ROOT_DIR}/lib/libhdf5.so"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DHDF5_HL_LIBRARY_DIRS=${HDF5_ROOT_DIR}/lib"
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DHDF5_HL_LIBRARY:PATH=${HDF5_ROOT_DIR}/lib/libhdf5_hl.so"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
 fi
 
 ### VisIt Database bridge settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOSTDIR}"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
 
 ### gl2ps settings
-if [ "${GL2PSHOME}" != "" ]; then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_GL2PS:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DGL2PS_INCLUDE_DIR:STRING=${GL2PSHOME}/include"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DGL2PS_LIBRARY:STRING=${GL2PSHOME}/lib/libgl2ps.so"
+if [ "${GL2PS_ROOT_DIR}" != "" ]; then
+    #CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_USE_GL2PS:BOOL=ON"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DGL2PS_INCLUDE_DIR:STRING=${GL2PS_ROOT_DIR}/include"
+    CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DGL2PS_LIBRARY:STRING=${GL2PS_ROOT_DIR}/lib/libgl2ps.so"
 fi
 
 ### Extra options (switch off non-used Paraview plug-ins)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessing:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_Prism:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_VisTrailsPlugin:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+#CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_VisTrailsPlugin:BOOL=OFF"
+#CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=OFF"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
 
 ### Extra options (switch on required Paraview plug-ins)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
-
-### Mesa settings (if pre-installed) [OBSOLETE]
-with_mesa=0
-if [ "${with_mesa}" == "1" ] && [ "$MESA_HOME" != "" ] ; then
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_INCLUDE_DIR:STRING=${MESA_HOME}/include"
-  if test `uname -m` = "x86_64" ; then
-      CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib64/libGL.so"
-      CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib64/libGLU.so"
-  else
-      CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib/libGL.so"
-      CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib/libGLU.so"
-  fi
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_xmesa_INCLUDE_DIR:STRING=${MESA_HOME}/include"
-fi
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+#CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=ON"
+CMAKE_OPTIONS=${CMAKE_OPTIONS}" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
 
 # configure
     
@@ -250,57 +266,50 @@ tclsh  : `which tclsh`
 qmake  : `which qmake`
 
 used ParaView configuration options:
-$CMAKE_OPTIONS
+${CMAKE_OPTIONS}
 EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} $CMAKE_OPTIONS
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} ${CMAKE_OPTIONS}
+
+# patch buildir
+local patch_fatal_warnings=0
+if [ "${patch_fatal_warnings}" = "1" ] ; then
+    sed -i "s%-Wl,--fatal-warnings%%g" ${PRODUCT_BUILD_DIR}/VTK/Wrapping/Python/CMakeFiles/vtkpython.dir/link.txt
+fi
 
 # make
 
 cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=`which gcc`
 EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make -j4
+check_job ${PRODUCT_DIR}/MAKE.LOG make VERBOSE=1
 
 # make install
-
-### `make install` has been replaced by `cpack` since Paraview 3.10.0
-use_make_install=0
-if [ "${use_make_install}" == "1" ] ; then
-    check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
    
-    ### Patch binaries
-    # - patch for missing libvtkPV*.so libraries (ParaView 3.10 development version) [OBSOLETE (fixed in 3.10.1)]
-    need_patch_libvtkpv=0
-    if [ "${need_patch_libvtkpv}" == "1" ] ; then
-       cd ${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}
-       for f in `find . -name "vtkPV*.so"` XXX ; do
-           if test "$f" == "XXX" ; then continue ; fi
-           d=`dirname $f`
-           f=`basename $f`
-           ( cd $d; if test ! -e lib$f ; then ln -sf $f lib$f ; fi;  ) 
-       done
-    fi
-else
-    check_job ${PRODUCT_DIR}/CPACK.LOG cpack -G TGZ --config Applications/ParaView/CPackParaView-DevelopmentConfig.cmake
-    bindir=`find ${PRODUCT_BUILD_DIR}/_CPack_Packages -type d -name "ParaView-*-${PVLIBVERSION}*"`
-    if [ "${bindir}" != "" ] ; then
-        cp -rf ${bindir}/* ${PRODUCT_DIR}
-    else
-       echo "Error on cpack step! CPack archive is not found! Exiting"
-    fi
-fi 
-
-### Patch binaries
-# - patch Paraview problem (bad VisItBridge configuration) [OBSOLETE (fixed in 3.10.1)]
-patch_visit_usage=0
-if [ "${patch_visit_usage}" == "1" ] ; then
-    sed -i "s%SET(PARAVIEW_USE_VISITBRIDGE \"ON\")%SET(PARAVIEW_USE_VISITBRIDGE \"OFF\")%g" ${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}/ParaViewConfig.cmake
+# patch binaries
+local patch_vtkconfig=1
+if [ "${patch_vtkconfig}" = "1" ] ; then
+    cp -f ${PRODUCT_BUILD_DIR}/VTK/VTKTargets.cmake ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}
+    sed -i "s%\(IMPORTED_LOCATION_RELEASE.*\"\).*/lib/\([^/]\+\"\)%\1${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}/\2%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
+    sed -i "s%\(IMPORTED_LOCATION_RELEASE.*\"\).*/bin/\([^/]\+\"\)%\1${PRODUCT_DIR}/bin/\2%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
+    sed -i "s%[^;\"]\+/qt-[0-9\.]\+/lib/\([^;]\+\)%${QT4_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
+    sed -i "s%[^;\"]\+/Python-[0-9\.]\+/lib/\([^;]\+\)%${PYTHON_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
+    sed -i "s%[^;\"]\+/hdf5-[0-9\.]\+/lib/\([^;]\+\)%${HDF5_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
+    sed -i "s%[^;\"]\+/gl2ps-[0-9\.]\+/lib/\([^;]\+\)%${GL2PS_ROOT_DIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
+    cp -f ${PRODUCT_SRC_DIR}/VTK/CMake/vtkTestingMacros.cmake ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}
+    sed -i "s%include(\".*/vtkTestingMacros.cmake\")%include(\"\${VTK_INSTALL_PREFIX}/lib/cmake/paraview-${PVLIBVERSION}/vtkTestingMacros.cmake\")%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKConfig.cmake
+fi
+
+local patch_nvidia_deps=1
+if [ "${patch_nvidia_deps}" = "1" ] ; then
+    sed -i "s%/usr/lib/libXNVCtrl.a;%%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake
+    sed -i "s%/usr/lib/libXNVCtrl.a;%%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/ParaViewTargets-release.cmake
 fi
 
 cd ${PRODUCT_DIR}
 
 # remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+if [ ${REMOVE_SRC_TMP} = "TRUE" ] ; then
     test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
     test -d ${PRODUCT_BUILD_DIR} && rm -fr ${PRODUCT_BUILD_DIR}
 fi
@@ -312,36 +321,52 @@ try_preinstalled
 install_binary()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
 # create a product directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-data_archive=${SOURCE_DIR}/../../SOURCES/ParaViewData-${PVVERSION}.tar.gz
+data_archive=${SOURCE_DIR}/../../SOURCES/ParaViewData-${VERSION_PARAVIEW}.tar.gz
 if [ ! -f ${data_archive} ] ; then
     data_archive=${SOURCE_DIR}/../../SOURCES/ParaViewData-${PVLIBVERSION}.tar.gz
 fi
-check_jb tar xfz ${data_archive} -C ${INST_ROOT}
+if [ -f ${data_archive} ] ; then
+    check_jb tar xfz ${data_archive} -C ${INST_ROOT}
+fi
 
 cd ${PRODUCT_DIR}
 
 for f in `find . -name "*.cmake"` ; do
-sed -e "s%/[^\";]*/bin/moc%$QTDIR/bin/moc%g"     \
-    -e "s%/[^\";]*/bin/uic%$QTDIR/bin/uic%g"     \
-    -e "s%/[^\";]*/bin/rcc%$QTDIR/bin/rcc%g"     \
-    -e "s%/[^\";]*/bin/qmake%$QTDIR/bin/qmake%g" \
-    -e "s%/[^\";]*/lib/libQt%$QTDIR/lib/libQt%g" \
-    -e "s%/[^\";]*/lib64/libQt%$QTDIR/lib64/libQt%g" \
-    -e "s%/[^\";]*/lib/python\([0-9].[0-9]\)/config/libpython%$PYTHONHOME/lib/python\1/config/libpython%g" \
-    -e "s%/[^\";]*/include/python\([0-9].[0-9]\)%$PYTHONHOME/include/python\1%g" \
+sed -e "s%/[^\";]*/bin/moc%${QT4_ROOT_DIR}/bin/moc%g"     \
+    -e "s%/[^\";]*/bin/uic%${QT4_ROOT_DIR}/bin/uic%g"     \
+    -e "s%/[^\";]*/bin/rcc%${QT4_ROOT_DIR}/bin/rcc%g"     \
+    -e "s%/[^\";]*/bin/qmake%${QT4_ROOT_DIR}/bin/qmake%g" \
+    -e "s%/[^\";]*/lib/libQt%${QT4_ROOT_DIR}/lib/libQt%g" \
+    -e "s%/[^\";]*/lib64/libQt%${QT4_ROOT_DIR}/lib64/libQt%g" \
+    -e "s%/[^\";]*/lib/python\([0-9].[0-9]\)/config/libpython%${PYTHON_ROOT_DIR}/lib/python\1/config/libpython%g" \
+    -e "s%/[^\";]*/include/python\([0-9].[0-9]\)%${PYTHON_ROOT_DIR}/include/python\1%g" \
     -e "s%/[^\";]*/tcltk[^/]*/include%${TCLHOME}/include%g" \
     -e "s%/[^\";]*/tcltk[^/]*/lib%${TCLHOME}/lib%g" \
-    -e "s%/[^\";]*/lib/libhdf5.so%${HDF5HOME}/lib/libhdf5.so%g" \
-    -e "s%/[^\";]*/lib64/libhdf5.so%${HDF5HOME}/lib64/libhdf5.so%g" \
+    -e "s%/[^\";]*/hdf5-[0-9]\+\.[0-9]\+\.[0-9]\+/include%${HDF5_ROOT_DIR}/include%g" \
+    -e "s%/[^\";]*/lib/libhdf5.so%${HDF5_ROOT_DIR}/lib/libhdf5.so%g" \
+    -e "s%/[^\";]*/lib64/libhdf5.so%${HDF5_ROOT_DIR}/lib64/libhdf5.so%g" \
+    -e "s%/[^\";]*/lib/libhdf5_hl.so%${HDF5_ROOT_DIR}/lib/libhdf5_hl.so%g" \
+    -e "s%/[^\";]*/lib64/libhdf5_hl.so%${HDF5_ROOT_DIR}/lib64/libhdf5_hl.so%g" \
+    -e "s%/[^\";]*/gl2ps-[0-9]\+\.[0-9]\+\.[0-9]\+/include%${GL2PS_ROOT_DIR}/include%g" \
+    -e "s%/[^\";]*/lib/libgl2ps.so%${GL2PS_ROOT_DIR}/lib/libgl2ps.so%g" \
+    -e "s%/[^\";]*/lib64/libgl2ps.so%${GL2PS_ROOT_DIR}/lib64/libgl2ps.so%g" \
+    -e "s%\(IMPORTED_LOCATION_RELEASE.*\"\).*/lib/paraview-${PVLIBVERSION}/\([^/]\+\"\)%\1${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}/\2%g" \
+    -e "s%\(IMPORTED_LOCATION_RELEASE.* \"\).*/bin/\([^/]\+\"\)%\1${PRODUCT_DIR}/bin/\2%g" \
     ${f} > ${f}.new
     mv -f ${f}.new ${f}
 done
+#sed -i "s%set (VTK_CONFIG_FILE \".*/VTKConfig.cmake\")%set (VTK_CONFIG_FILE \"${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKConfig.cmake\")%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/ParaViewConfig.cmake
+#sed -i "s%set (PARAVIEW_CONFIG_TARGETS_FILE \".*/ParaViewTargets.cmake\")%set (PARAVIEW_CONFIG_TARGETS_FILE \"${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/ParaViewTargets.cmake\")%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/ParaViewConfig.cmake
+#sed -i "s%set (ParaView_CMAKE_DIR \".*\")%set (ParaView_CMAKE_DIR \"${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}\")%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/ParaViewConfig.cmake
+
+sed -i "s%set[[:space:]]*(QtTesting_INCLUDE_DIRS \".*\")%set (QtTesting_INCLUDE_DIRS \"${PRODUCT_DIR}/include/paraview-${PVLIBVERSION}\")%g" ${PRODUCT_DIR}/lib/CMake/QtTestingConfig.cmake
+sed -i "s%set[[:space:]]*(QtTesting_LIBRARY_DIR \".*\")%set (QtTesting_LIBRARY_DIR \"${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}\")%g" ${PRODUCT_DIR}/lib/CMake/QtTestingConfig.cmake
 
 # to generate environment script for sources
 try_preinstalled
@@ -356,10 +381,10 @@ export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="ParaView-${PVVERSION}"
+test $# = 10 && shift && SINGLE_DIR=$9
+export PRODUCT="ParaView-${VERSION_PARAVIEW}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
 source ./common.sh
-$PROCEDURE 
+${PROCEDURE}