spns #20038 replace 'cmake_op=..' by 'cmake+=..'

author Abdoulbari ZAKIR <Abdoulbari.Zakir@cea.fr>

Wed, 9 Jun 2021 09:07:51 +0000 (11:07 +0200)

committer Nabil Ghodbane <nabil.ghodbane@cea.fr>

Fri, 25 Jun 2021 13:50:11 +0000 (15:50 +0200)
author Abdoulbari ZAKIR <Abdoulbari.Zakir@cea.fr>
Wed, 9 Jun 2021 09:07:51 +0000 (11:07 +0200)
committer Nabil Ghodbane <nabil.ghodbane@cea.fr>
Fri, 25 Jun 2021 13:50:11 +0000 (15:50 +0200)
diff --git a/products/compil_scripts/ADAO.sh b/products/compil_scripts/ADAO.sh

index 85c145409b80dff8227184bc586ad36f614575c8..188ff66557f4b18654d9d6d94916e0bc8f1c02ba 100755 (executable)
--- a/products/compil_scripts/ADAO.sh
+++ b/products/compil_scripts/ADAO.sh
@@ -14,8 +14,8 @@ echo "##########################################################################
  export CURRENT_SOFTWARE_INSTALL_DIR=${PRODUCT_INSTALL}
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
  
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
@@ -52,12 +52,12 @@ export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packag
  
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DADAO_PYTHON_MODULE=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DKERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DADAO_PYTHON_ROOT_DIR=${ADAO_PYTHON_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DEFICAS_ROOT_DIR=${EFICAS_TOOLS_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DADAO_PYTHON_MODULE=OFF"
+CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
+CMAKE_OPTIONS+=" -DKERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DADAO_PYTHON_ROOT_DIR=${ADAO_PYTHON_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DEFICAS_ROOT_DIR=${EFICAS_TOOLS_ROOT_DIR}"
  
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
diff --git a/products/compil_scripts/ParaView-3.14.0.sh b/products/compil_scripts/ParaView-3.14.0.sh

index f971d01b3163f4a40a9da7cf70944cfa2ec55da3..5d878c8bc5e531265d0db96a7a592a3499b23251 100755 (executable)
--- a/products/compil_scripts/ParaView-3.14.0.sh
+++ b/products/compil_scripts/ParaView-3.14.0.sh
@@ -25,80 +25,80 @@ python_name=python$PYTHON_VERSION
  CMAKE_OPTIONS=""
  
  ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  ### 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+=" -DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1"
+CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`"
  if [[ $BITS == "64" ]]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  fi
  
  ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON"
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON"
+#CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
  
  ### VTK general settings
-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"
+CMAKE_OPTIONS+=" -DVTK_USE_HYBRID:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_PARALLEL:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_PATENTED:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_USE_RENDERING:BOOL=ON"
+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+=" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_QT_USE_WEBKIT:BOOL=ON"
  
  ### Python settings
-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=${PYTHON_ROOT_DIR}/bin/${python_name}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_WRAP_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
+CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_PATH:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
+CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
  
  ### No tcl tk wrap
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_TK:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_TCL:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_USE_TK:BOOL=OFF"
  
  ### HDF5 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_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+=" -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_INCLUDE_DIR:STRING=${HDF5HOME}/include"
+CMAKE_OPTIONS+=" -DHDF5_LIBRARY:STRING=${HDF5HOME}/lib/libhdf5.so"
  
  ### VisIt Database bridge settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOSTDIR}"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON"
+CMAKE_OPTIONS+=" -DBOOST_ROOT=${BOOSTDIR}"
  
  ### gl2ps settings
-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=${GL2PSDIR}/include"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DGL2PS_LIBRARY:STRING=${GL2PSDIR}/lib/libgl2ps.so"
+CMAKE_OPTIONS+=" -DVTK_USE_GL2PS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+CMAKE_OPTIONS+=" -DGL2PS_INCLUDE_DIR:STRING=${GL2PSDIR}/include"
+CMAKE_OPTIONS+=" -DGL2PS_LIBRARY:STRING=${GL2PSDIR}/lib/libgl2ps.so"
  
  ### 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+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessing:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Prism:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_VisTrailsPlugin:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_COPROCESSING: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"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
  
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
diff --git a/products/compil_scripts/ParaView-4.2.0.sh b/products/compil_scripts/ParaView-4.2.0.sh

index 72a5cb1d0aaa41da683d611754bea588c0321e03..1c7af67077c5bee45b5bdbc289e8e5e9cc18c075 100755 (executable)
--- a/products/compil_scripts/ParaView-4.2.0.sh
+++ b/products/compil_scripts/ParaView-4.2.0.sh
@@ -12,100 +12,100 @@ export python_name=python$PYTHON_VERSION
  CMAKE_OPTIONS=""
  
  ### verbose log
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
  
  ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  
  ### compiler settings
  if [[ $BITS == "64" ]]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  fi
  
  ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`"
  fi
  
  ### VTK general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
+CMAKE_OPTIONS+=" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
  
  ### Qt settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
  
  ### Python settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
+CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
+CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
  
  ### No tcl tk wrap
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_JAVA:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_TCL:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_JAVA:BOOL=OFF"
  
  ### HDF5 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
  
  
  ### VisIt Database bridge settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
  
  ### Boost settings (needed when activating VisIt bridge)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
  
  ### gl2ps settings
-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"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+CMAKE_OPTIONS+=" -DGL2PS_INCLUDE_DIR:STRING=${GL2PS_ROOT_DIR}/include"
+CMAKE_OPTIONS+=" -DGL2PS_LIBRARY:STRING=${GL2PS_ROOT_DIR}/lib/libgl2ps.so"
  
  ### libxml2 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+CMAKE_OPTIONS+=" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
+CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
+CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
  
  ### freetype settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+CMAKE_OPTIONS+=" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
+CMAKE_OPTIONS+=" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
  
  
  ### Extra options (switch off non-used Paraview plug-ins)
-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_PacMan:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl: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"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
  
  mkdir -p BUILD
  cd BUILD
diff --git a/products/compil_scripts/ParaView-5.0.sh b/products/compil_scripts/ParaView-5.0.sh

index 002932c5be0bbf1d65934cf48089eddc6630ecb6..12f4dd0a41dc041cdfcee5c2137fea76c8f6791d 100755 (executable)
--- a/products/compil_scripts/ParaView-5.0.sh
+++ b/products/compil_scripts/ParaView-5.0.sh
@@ -12,133 +12,133 @@ export python_name=python$PYTHON_VERSION
  CMAKE_OPTIONS=""
  
  ### verbose log
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
  
  ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  
  ### compiler settings
  if [[ $BITS == "64" ]]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  fi
  
  ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`"
  fi
  
  ### VTK general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_FULL_THREADSAFE=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
+CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
+CMAKE_OPTIONS+=" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE=ON"
  ### OpenGL2 backend for performance improvment
  # https://blog.kitware.com/new-opengl-rendering-in-vtk/ 
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_RENDERING_BACKEND=OpenGL2"     
+#CMAKE_OPTIONS+=" -DVTK_RENDERING_BACKEND=OpenGL2"     
  ### OpenMP to speed computation of some filters
  # https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
  # https://blog.kitware.com/accelerated-filters-in-paraview-5/
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
+#CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
  
  ### Qt settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
  if [ -n "$QT5_ROOT_DIR" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_QT_VERSION=5"
+    CMAKE_OPTIONS+=" -DPARAVIEW_QT_VERSION=5"
  fi
  
  ### Python settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
  if [ -n "$PYTHONHOME" ] 
  then
    # with a native python, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
+  CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
  fi
  
  ### No tcl tk wrap
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_JAVA:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_TCL:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_JAVA:BOOL=OFF"
  
  ### HDF5 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
  
  
  ### VisIt Database bridge settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
  
  ### Boost settings (needed when activating VisIt bridge)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
  
  ### gl2ps settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
  if [ -n "$GL2PS_ROOT_DIR" ] 
  then
    # with a native gl2ps, do not use these options
-  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"
+  CMAKE_OPTIONS+=" -DGL2PS_INCLUDE_DIR:STRING=${GL2PS_ROOT_DIR}/include"
+  CMAKE_OPTIONS+=" -DGL2PS_LIBRARY:STRING=${GL2PS_ROOT_DIR}/lib/libgl2ps.so"
  fi
  
  ### libxml2 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
  if [ -n "$LIBXML2_ROOT_DIR" ] 
  then
    # with a native libxml2, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
+  CMAKE_OPTIONS+=" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
+  CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
+  CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
  fi
  
  ### freetype settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
  if [ -n "$FREETYPE_ROOT_DIR" ] 
  then
    # with a native freetype, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
+  CMAKE_OPTIONS+=" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
+  CMAKE_OPTIONS+=" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
  fi
  
  ### Extra options since OCC presta to improve Paraview for Salome
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_3DGLYPH:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_EXTENDED_OPENFILEDIALOG:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_TIMECONTROL_SLIDER:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_3DGLYPH:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_EXTENDED_OPENFILEDIALOG:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_TIMECONTROL_SLIDER:BOOL=ON"
  
  ### Extra options (switch off non-used Paraview plug-ins)
-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_PacMan:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl: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"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
  
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
diff --git a/products/compil_scripts/ParaView-5.1-820-offscreen_rendering.sh b/products/compil_scripts/ParaView-5.1-820-offscreen_rendering.sh

index dcb956f498d2b42b243f98c037ad6e40f7bc91f0..56737efd551707555016258cb9d2e1aa9158fd46 100755 (executable)
--- a/products/compil_scripts/ParaView-5.1-820-offscreen_rendering.sh
+++ b/products/compil_scripts/ParaView-5.1-820-offscreen_rendering.sh
@@ -12,140 +12,140 @@ export python_name=python$PYTHON_VERSION
  CMAKE_OPTIONS=""
  
  ### verbose log
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
  
  ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  
  ### compiler settings
  if [[ $BITS == "64" ]]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  fi
  
  ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`"
  fi
  
  ### VTK general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_FULL_THREADSAFE=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
+CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
+CMAKE_OPTIONS+=" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE=ON"
  ### OpenGL2 backend for performance improvment
  # https://blog.kitware.com/new-opengl-rendering-in-vtk/ 
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_RENDERING_BACKEND=OpenGL2"     
+#CMAKE_OPTIONS+=" -DVTK_RENDERING_BACKEND=OpenGL2"     
  ### OpenMP to speed computation of some filters
  # https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
  # https://blog.kitware.com/accelerated-filters-in-paraview-5/
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
+#CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
  
  ### Qt settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
  
  ### Python settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
  if [ -n "$PYTHONHOME" ] 
  then
    # with a native python, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
+  CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
  fi
  
  ### No tcl tk wrap
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_JAVA:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_TCL:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_JAVA:BOOL=OFF"
  
  ### HDF5 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
  
  
  ### VisIt Database bridge settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
  
  ### Boost settings (needed when activating VisIt bridge)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
  
  ### gl2ps settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
  if [ -n "$GL2PS_ROOT_DIR" ] 
  then
    # with a native gl2ps, do not use these options
-  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"
+  CMAKE_OPTIONS+=" -DGL2PS_INCLUDE_DIR:STRING=${GL2PS_ROOT_DIR}/include"
+  CMAKE_OPTIONS+=" -DGL2PS_LIBRARY:STRING=${GL2PS_ROOT_DIR}/lib/libgl2ps.so"
  fi
  
  ### libxml2 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
  if [ -n "$LIBXML2_ROOT_DIR" ] 
  then
    # with a native libxml2, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
+  CMAKE_OPTIONS+=" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
+  CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
+  CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
  fi
  
  ### freetype settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
  if [ -n "$FREETYPE_ROOT_DIR" ] 
  then
    # with a native freetype, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
+  CMAKE_OPTIONS+=" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
+  CMAKE_OPTIONS+=" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
  fi
  
  ### Extra options since OCC presta to improve Paraview for Salome
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_3DGLYPH:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_EXTENDED_OPENFILEDIALOG:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_TIMECONTROL_SLIDER:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_3DGLYPH:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_EXTENDED_OPENFILEDIALOG:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_TIMECONTROL_SLIDER:BOOL=ON"
  
  ### Extra options (switch off non-used Paraview plug-ins)
-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_PacMan:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl: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"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
  
  # Offscreen-rendering
-CMAKE_OPTIONS=$CMAKE_OPTIONS"   -DVTK_USE_X=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS"   -DOPENGL_INCLUDE_DIR=IGNORE" #wiki paraview #${MESA_ROOT_DIR}/include"
-CMAKE_OPTIONS=$CMAKE_OPTIONS"   -DOPENGL_xmesa_INCLUDE_DIR=IGNORE" #wiki paraview
-CMAKE_OPTIONS=$CMAKE_OPTIONS"   -DOPENGL_gl_LIBRARY=IGNORE" #wiki paraview #${MESA_ROOT_DIR}/lib/libOSMesa.so
-#CMAKE_OPTIONS=$CMAKE_OPTIONS"   -DOPENGL_glu_LIBRARY=${GLU_ROOT_DIR}/lib/libGLU.so" #devrait etre -DOPENGL_glu_LIBRARY=${MESA_ROOT_DIR}/lib/libGLU.so mais libGLU.so est manquant dans l'install de mesa
-CMAKE_OPTIONS=$CMAKE_OPTIONS"   -DVTK_OPENGL_HAS_OSMESA=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS"   -DVTK_USE_OFFSCREEN=OFF" #wiki paraview
-CMAKE_OPTIONS=$CMAKE_OPTIONS"   -DOSMESA_INCLUDE_DIR=${MESA_ROOT_DIR}/include"
-CMAKE_OPTIONS=$CMAKE_OPTIONS"   -DOSMESA_LIBRARY=${MESA_ROOT_DIR}/lib/libOSMesa.so"
+CMAKE_OPTIONS+="   -DVTK_USE_X=OFF"
+CMAKE_OPTIONS+="   -DOPENGL_INCLUDE_DIR=IGNORE" #wiki paraview #${MESA_ROOT_DIR}/include"
+CMAKE_OPTIONS+="   -DOPENGL_xmesa_INCLUDE_DIR=IGNORE" #wiki paraview
+CMAKE_OPTIONS+="   -DOPENGL_gl_LIBRARY=IGNORE" #wiki paraview #${MESA_ROOT_DIR}/lib/libOSMesa.so
+#CMAKE_OPTIONS+="   -DOPENGL_glu_LIBRARY=${GLU_ROOT_DIR}/lib/libGLU.so" #devrait etre -DOPENGL_glu_LIBRARY=${MESA_ROOT_DIR}/lib/libGLU.so mais libGLU.so est manquant dans l'install de mesa
+CMAKE_OPTIONS+="   -DVTK_OPENGL_HAS_OSMESA=ON"
+CMAKE_OPTIONS+="   -DVTK_USE_OFFSCREEN=OFF" #wiki paraview
+CMAKE_OPTIONS+="   -DOSMESA_INCLUDE_DIR=${MESA_ROOT_DIR}/include"
+CMAKE_OPTIONS+="   -DOSMESA_LIBRARY=${MESA_ROOT_DIR}/lib/libOSMesa.so"
  
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
diff --git a/products/compil_scripts/ParaView-5.1-820.sh b/products/compil_scripts/ParaView-5.1-820.sh

index 14fe9a9361888e8b1a9c179094a652fdd912fd45..9bd7472221979f594b7eab20f5ae9dae568ae43e 100755 (executable)
--- a/products/compil_scripts/ParaView-5.1-820.sh
+++ b/products/compil_scripts/ParaView-5.1-820.sh
@@ -12,135 +12,135 @@ export python_name=python$PYTHON_VERSION
  CMAKE_OPTIONS=""
  
  ### verbose log
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
  
  ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  
  ### compiler settings
  if [[ $BITS == "64" ]]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  fi
  
  ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
  fi
  
  ### VTK general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_FULL_THREADSAFE=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
+CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
+CMAKE_OPTIONS+=" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE=ON"
  ### OpenGL2 backend for performance improvment
  # https://blog.kitware.com/new-opengl-rendering-in-vtk/ 
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_RENDERING_BACKEND=OpenGL2"     
+#CMAKE_OPTIONS+=" -DVTK_RENDERING_BACKEND=OpenGL2"     
  ### OpenMP to speed computation of some filters
  # https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
  # https://blog.kitware.com/accelerated-filters-in-paraview-5/
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
+#CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
  
  ### Qt settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
  if [ -n "$QT5_ROOT_DIR" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_QT_VERSION=5"
+    CMAKE_OPTIONS+=" -DPARAVIEW_QT_VERSION=5"
  fi
  
  ### Python settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
  if [ -n "$PYTHONHOME" ] 
  then
    # with a native python, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
+  CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
  fi
  
  ### No tcl tk wrap
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_JAVA:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_TCL:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_JAVA:BOOL=OFF"
  
  ### HDF5 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
  
  
  ### VisIt Database bridge settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
  
  ### Boost settings (needed when activating VisIt bridge)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
  
  ### gl2ps settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
  if [ -n "$GL2PS_ROOT_DIR" ] 
  then
    # with a native gl2ps, do not use these options
-  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"
+  CMAKE_OPTIONS+=" -DGL2PS_INCLUDE_DIR:STRING=${GL2PS_ROOT_DIR}/include"
+  CMAKE_OPTIONS+=" -DGL2PS_LIBRARY:STRING=${GL2PS_ROOT_DIR}/lib/libgl2ps.so"
  fi
  
  ### libxml2 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
  if [ -n "$LIBXML2_ROOT_DIR" ] 
  then
    # with a native libxml2, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
+  CMAKE_OPTIONS+=" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
+  CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
+  CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
  fi
  
  ### freetype settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
  if [ -n "$FREETYPE_ROOT_DIR" ] 
  then
    # with a native freetype, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
+  CMAKE_OPTIONS+=" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
+  CMAKE_OPTIONS+=" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
  fi
  
  ### Extra options since OCC presta to improve Paraview for Salome
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_3DGLYPH:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_EXTENDED_OPENFILEDIALOG:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_TIMECONTROL_SLIDER:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_3DGLYPH:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_EXTENDED_OPENFILEDIALOG:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_TIMECONTROL_SLIDER:BOOL=ON"
  
  ### Extra options (switch off non-used Paraview plug-ins)
-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_PacMan:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl: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"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
  
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
diff --git a/products/compil_scripts/ParaView-5.1.sh b/products/compil_scripts/ParaView-5.1.sh

index 8f8473bbf4a9ccbf8f3a08a6557cdc1683104a60..faadba590fa54be3aabfde0cab3b03f86288a18b 100755 (executable)
--- a/products/compil_scripts/ParaView-5.1.sh
+++ b/products/compil_scripts/ParaView-5.1.sh
@@ -12,136 +12,136 @@ export python_name=python$PYTHON_VERSION
  CMAKE_OPTIONS=""
  
  ### verbose log
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
  
  ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  ### for import/export in CGNS format
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CGNS=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CGNS=ON"
  
  
  ### compiler settings
  if [[ $BITS == "64" ]]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  fi
  
  ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`"
  fi
  
  ### VTK general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_FULL_THREADSAFE=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
+CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
+CMAKE_OPTIONS+=" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE=ON"
  ### OpenGL2 backend for performance improvment
  # https://blog.kitware.com/new-opengl-rendering-in-vtk/ 
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_RENDERING_BACKEND=OpenGL2"     
+#CMAKE_OPTIONS+=" -DVTK_RENDERING_BACKEND=OpenGL2"     
  ### OpenMP to speed computation of some filters
  # https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
  # https://blog.kitware.com/accelerated-filters-in-paraview-5/
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
+#CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
  
  ### Qt settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
  if [ -n "$QT5_ROOT_DIR" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_QT_VERSION=5"
+    CMAKE_OPTIONS+=" -DPARAVIEW_QT_VERSION=5"
  fi
  
  ### Python settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
  if [ -n "$PYTHONHOME" ] 
  then
    # with a native python, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
+  CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
  fi
  
  ### No tcl tk wrap
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_JAVA:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_TCL:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_JAVA:BOOL=OFF"
  
  ### HDF5 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
  
  
  ### VisIt Database bridge settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
  
  ### Boost settings (needed when activating VisIt bridge)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
  
  ### gl2ps settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
  if [ -n "$GL2PS_ROOT_DIR" ] 
  then
    # with a native gl2ps, do not use these options
-  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"
+  CMAKE_OPTIONS+=" -DGL2PS_INCLUDE_DIR:STRING=${GL2PS_ROOT_DIR}/include"
+  CMAKE_OPTIONS+=" -DGL2PS_LIBRARY:STRING=${GL2PS_ROOT_DIR}/lib/libgl2ps.so"
  fi
  
  ### libxml2 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
  if [ -n "$LIBXML2_ROOT_DIR" ] 
  then
    # with a native libxml2, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
+  CMAKE_OPTIONS+=" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
+  CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
+  CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
  fi
  
  ### freetype settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
  if [ -n "$FREETYPE_ROOT_DIR" ] 
  then
    # with a native freetype, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
+  CMAKE_OPTIONS+=" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
+  CMAKE_OPTIONS+=" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
  fi
  
  ### Extra options since OCC presta to improve Paraview for Salome
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_3DGLYPH:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_EXTENDED_OPENFILEDIALOG:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_TIMECONTROL_SLIDER:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_3DGLYPH:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_EXTENDED_OPENFILEDIALOG:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_TIMECONTROL_SLIDER:BOOL=ON"
  
  ### Extra options (switch off non-used Paraview plug-ins)
-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_PacMan:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl: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"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
  
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
diff --git a/products/compil_scripts/ParaView-5.4-b5c4c89.sh b/products/compil_scripts/ParaView-5.4-b5c4c89.sh

index 0df376fa7d02cf175ba52abd64fedcb58b7ad0b2..3a6dd3d1f36d87a6c9e83fbf96847289ee936429 100755 (executable)
--- a/products/compil_scripts/ParaView-5.4-b5c4c89.sh
+++ b/products/compil_scripts/ParaView-5.4-b5c4c89.sh
@@ -12,154 +12,154 @@ export python_name=python$PYTHON_VERSION
  CMAKE_OPTIONS=""
  
  ### verbose log
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
  
  ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  
  ### compiler settings
  if [[ $BITS == "64" ]]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  fi
  
  ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
  fi
  
  ### VTK general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
+CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
+CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
  #TA 09/01/18 Modification due to latest version of ParaView-b5c4c893
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_INSTALL_LIBRARY_DIR="lib/paraview-5.4""
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_SITE_PACKAGES_SUFFIX="site-packages""
+#CMAKE_OPTIONS+=" -DVTK_INSTALL_LIBRARY_DIR="lib/paraview-5.4""
+#CMAKE_OPTIONS+=" -DVTK_PYTHON_SITE_PACKAGES_SUFFIX="site-packages""
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_FULL_THREADSAFE=ON"
+CMAKE_OPTIONS+=" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE=ON"
  
  ### OpenGL2 backend for performance improvment
  # https://blog.kitware.com/new-opengl-rendering-in-vtk/ 
  # OpenGl2 mandatory in this version of paraview
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_RENDERING_BACKEND:STRING=OpenGL2"
+CMAKE_OPTIONS+=" -DVTK_RENDERING_BACKEND:STRING=OpenGL2"
  ### OpenMP to speed computation of some filters
  # https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
  # https://blog.kitware.com/accelerated-filters-in-paraview-5/
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
+#CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
  
  ### Qt settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
  if [ -n "$QT5_ROOT_DIR" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_QT_VERSION=5"
+    CMAKE_OPTIONS+=" -DPARAVIEW_QT_VERSION=5"
  fi
  
  ### Python settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
  if [ -n "$PYTHONHOME" ] 
  then
    # with a native python, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
    if [ ${PYTHON_VERSION%%.*} == 3 ]
    then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config-${PYTHON_VERSION}/lib${python_name}.so"
+    CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config-${PYTHON_VERSION}/lib${python_name}.so"
    else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
+    CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
    fi
  fi
  
  ### No tcl tk wrap
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_JAVA:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_TCL:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_JAVA:BOOL=OFF"
  
  ### HDF5 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
  
  ### VisIt Database bridge settings
  if [ $DIST == "FD26" ]
  then
      echo  we are on fedora 26, we don t compile VISITBRIDGE
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=OFF"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
      ### Boost settings (needed when activating VisIt bridge)
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
+    CMAKE_OPTIONS+=" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
  fi
  
  ### gl2ps settings
  # VTK and system gl2ps conflict resolution
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
  if [ -n "$GL2PS_ROOT_DIR" ] 
  then
    # with a native gl2ps, do not use these options
-  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"
+  CMAKE_OPTIONS+=" -DGL2PS_INCLUDE_DIR:STRING=${GL2PS_ROOT_DIR}/include"
+  CMAKE_OPTIONS+=" -DGL2PS_LIBRARY:STRING=${GL2PS_ROOT_DIR}/lib/libgl2ps.so"
  fi
  
  ### libxml2 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
  if [ -n "$LIBXML2_ROOT_DIR" ] 
  then
    # with a native libxml2, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
+  CMAKE_OPTIONS+=" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
+  CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
+  CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
  fi
  
  ### freetype settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
  if [ -n "$FREETYPE_ROOT_DIR" ] 
  then
    # with a native freetype, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
+  CMAKE_OPTIONS+=" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
+  CMAKE_OPTIONS+=" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
  fi
  
  ### Extra options since OCC presta to improve Paraview for Salome
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_3DGLYPH:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_EXTENDED_OPENFILEDIALOG:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_TIMECONTROL_SLIDER:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_3DGLYPH:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_EXTENDED_OPENFILEDIALOG:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_TIMECONTROL_SLIDER:BOOL=ON"
  
  ### Extra options (switch off non-used Paraview plug-ins)
-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_PacMan:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_MobileRemoteControl:BOOL=OFF"
  
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_WEB=OFF"
+#CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_WEB=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"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
  
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
diff --git a/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh b/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh

index ba93e7731a844cb5a09c1367dd8960dfddcc730e..39a7fef6938582004d8bee94eed5f7919c62f36a 100755 (executable)
--- a/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh
+++ b/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh
@@ -12,91 +12,91 @@ export python_name=python$PYTHON_VERSION
  CMAKE_OPTIONS=""
  
  ### verbose log
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
  
  ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
  if [ -n "$SAT_DEBUG" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Debug"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
  fi
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  
  ### compiler settings
  # OP TEST
  #if [[ $BITS == "64" ]]
  #then
-#    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-#    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+#    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+#    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  #fi
  # OP 29/05/2018 Add 2 options used by BO
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  
  ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
      # OP 11/04/2018 Option not used
-    #    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
+    #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
      # OP 29/05/2018 Option not used
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=ON"
+    #CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=ON"
      # OP 29/05/2018 Add option used by BO
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=ON"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
      # OP 11/04/2018 Option not used
-    #    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+    #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
      # OP 29/05/2018 Option not used
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=OFF"
+    #CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=OFF"
      # OP 29/05/2018 Add option used by BO
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
  fi
  
  ### VTK general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_FULL_THREADSAFE=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
+CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
+CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE=ON"
+CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
  
  # OP inhibit embedded Pygments and use the system (or SALOME) one
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON"
  
  # TA - OP 17/01/2018 Add options for ParaView libraries installation
  #         due to latest version of ParaView-b5c4c893
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_INSTALL_LIBRARY_DIR=lib/paraview-${PVLIBVERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_INSTALL_ARCHIVE_DIR=lib/paraview-${PVLIBVERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_PLUGINS_DIR=lib/paraview-${PVLIBVERSION}/plugins"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTKm_INSTALL_LIB_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_INSTALL_LIBRARY_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_INSTALL_ARCHIVE_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_PLUGINS_DIR=lib/paraview-${PVLIBVERSION}/plugins"
+CMAKE_OPTIONS+=" -DVTKm_INSTALL_LIB_DIR=lib/paraview-${PVLIBVERSION}"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
  
  ### OpenGL2 backend for performance improvment
  # https://blog.kitware.com/new-opengl-rendering-in-vtk/ 
  # OpenGl2 mandatory in this version of paraview
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_RENDERING_BACKEND:STRING=OpenGL2"
+CMAKE_OPTIONS+=" -DVTK_RENDERING_BACKEND:STRING=OpenGL2"
  ### OpenMP to speed computation of some filters
  # https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
  # https://blog.kitware.com/accelerated-filters-in-paraview-5/
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
+#CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
  
  ### Qt settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
  if [ -n "$QT5_ROOT_DIR" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_QT_VERSION=5"
+    CMAKE_OPTIONS+=" -DPARAVIEW_QT_VERSION=5"
      # OP 29/05/2018 Add option used by BO
      CMAKE_OPTIONS="${CMAKE_OPTIONS} -DQT_HELP_GENERATOR:STRING=${QT5_ROOT_DIR}/bin/qhelpgenerator"
  fi
@@ -104,7 +104,7 @@ fi
  CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF"
  
  ### Python settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
  
  # OP 29/05/2018 Add option used by BO
  CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON"
@@ -112,92 +112,92 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON"
  if [ -n "$PYTHONHOME" ] 
  then
    # with a native python, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
    if [ ${PYTHON_VERSION%%.*} == 3 ]
    then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config-${PYTHON_VERSION}/lib${python_name}.so"
+    CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config-${PYTHON_VERSION}/lib${python_name}.so"
    else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
+    CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
    fi
  fi
  
  ### No tcl tk wrap
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_JAVA:BOOL=OFF"
+#CMAKE_OPTIONS+=" -DVTK_WRAP_TCL:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_JAVA:BOOL=OFF"
  
  ### HDF5 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
  # OP 11/04/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
+#CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
  
  ### VisIt Database bridge settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
  
  ### Boost settings (needed when activating VisIt bridge)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
  
  ### gl2ps settings
  # VTK and system gl2ps conflict resolution
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
  if [ -n "$GL2PS_ROOT_DIR" ] 
  then
    # with a native gl2ps, do not use these options
-  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"
+  CMAKE_OPTIONS+=" -DGL2PS_INCLUDE_DIR:STRING=${GL2PS_ROOT_DIR}/include"
+  CMAKE_OPTIONS+=" -DGL2PS_LIBRARY:STRING=${GL2PS_ROOT_DIR}/lib/libgl2ps.so"
  fi
  
  ### libxml2 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
  if [ -n "$LIBXML2_ROOT_DIR" ] 
  then
    # with a native libxml2, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
+  CMAKE_OPTIONS+=" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
+  CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
+  CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
  fi
  
  ### freetype settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
  
  if [ -n "$FREETYPE_ROOT_DIR" ] 
  then
    # with a native freetype, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
+  CMAKE_OPTIONS+=" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
+  CMAKE_OPTIONS+=" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
  fi
  
  ### Extra options (switch off non-used Paraview plug-ins)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
  
  # OP 29/05/2018 Option not used
-#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_PacMan:BOOL=OFF"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=OFF"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_WEB=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_WEB=OFF"
  
  ### Extra options (switch on required Paraview plug-ins)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
  
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
  
  # OP 10/04/2018 Add cgns prerequisite for import/export in CGNS format
  # OP 10/04/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CGNS=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_FIND_REQUIRED:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_INCLUDE_DIR:STRING=${CGNS_ROOT_DIR}/include"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_LIBRARY:STRING=${CGNS_ROOT_DIR}/lib/libcgns.so"
+#CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CGNS=ON"
+CMAKE_OPTIONS+=" -DCGNS_FIND_REQUIRED:BOOL=ON"
+CMAKE_OPTIONS+=" -DCGNS_INCLUDE_DIR:STRING=${CGNS_ROOT_DIR}/include"
+CMAKE_OPTIONS+=" -DCGNS_LIBRARY:STRING=${CGNS_ROOT_DIR}/lib/libcgns.so"
  # OP TEST
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_CGNS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_CGNS:BOOL=ON"
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
  cmake ${CMAKE_OPTIONS} $SOURCE_DIR
diff --git a/products/compil_scripts/ParaView-5.5.2p2_7591431.sh b/products/compil_scripts/ParaView-5.5.2p2_7591431.sh

index 2b690c2f60efa9d206c83688545f05498923c3b8..e5e2497b77f628b4761913b1dee0fd62c6bd71f4 100755 (executable)
--- a/products/compil_scripts/ParaView-5.5.2p2_7591431.sh
+++ b/products/compil_scripts/ParaView-5.5.2p2_7591431.sh
@@ -12,86 +12,86 @@ export python_name=python$PYTHON_VERSION
  CMAKE_OPTIONS=""
  
  ### verbose log
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
  
  ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  
  ### compiler settings
  # OP TEST
  #if [[ $BITS == "64" ]]
  #then
-#    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-#    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+#    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+#    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  #fi
  # OP 29/05/2018 Add 2 options used by BO
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  
  ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
      # OP 11/04/2018 Option not used
-    #    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
+    #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
      # OP 29/05/2018 Option not used
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=ON"
+    #CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=ON"
      # OP 29/05/2018 Add option used by BO
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=ON"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
      # OP 11/04/2018 Option not used
-    #    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+    #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
      # OP 29/05/2018 Option not used
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=OFF"
+    #CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=OFF"
      # OP 29/05/2018 Add option used by BO
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
  fi
  
  ### VTK general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_FULL_THREADSAFE=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
+CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
+CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE=ON"
+CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
  
  # OP inhibit embedded Pygments and use the system (or SALOME) one
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON"
  
  # TA - OP 17/01/2018 Add options for ParaView libraries installation
  #         due to latest version of ParaView-b5c4c893
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_INSTALL_LIBRARY_DIR=lib/paraview-${PVLIBVERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_INSTALL_ARCHIVE_DIR=lib/paraview-${PVLIBVERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_PLUGINS_DIR=lib/paraview-${PVLIBVERSION}/plugins"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTKm_INSTALL_LIB_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_INSTALL_LIBRARY_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_INSTALL_ARCHIVE_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_PLUGINS_DIR=lib/paraview-${PVLIBVERSION}/plugins"
+CMAKE_OPTIONS+=" -DVTKm_INSTALL_LIB_DIR=lib/paraview-${PVLIBVERSION}"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
  
  ### OpenGL2 backend for performance improvment
  # https://blog.kitware.com/new-opengl-rendering-in-vtk/ 
  # OpenGl2 mandatory in this version of paraview
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_RENDERING_BACKEND:STRING=OpenGL2"
+CMAKE_OPTIONS+=" -DVTK_RENDERING_BACKEND:STRING=OpenGL2"
  ### OpenMP to speed computation of some filters
  # https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
  # https://blog.kitware.com/accelerated-filters-in-paraview-5/
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
+#CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
  
  ### Qt settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
  if [ -n "$QT5_ROOT_DIR" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_QT_VERSION=5"
+    CMAKE_OPTIONS+=" -DPARAVIEW_QT_VERSION=5"
      # OP 29/05/2018 Add option used by BO
      CMAKE_OPTIONS="${CMAKE_OPTIONS} -DQT_HELP_GENERATOR:STRING=${QT5_ROOT_DIR}/bin/qhelpgenerator"
  fi
@@ -99,7 +99,7 @@ fi
  CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF"
  
  ### Python settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
  
  # OP 29/05/2018 Add option used by BO
  CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON"
@@ -107,92 +107,92 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON"
  if [ -n "$PYTHONHOME" ] 
  then
    # with a native python, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
    if [ ${PYTHON_VERSION%%.*} == 3 ]
    then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config-${PYTHON_VERSION}/lib${python_name}.so"
+    CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config-${PYTHON_VERSION}/lib${python_name}.so"
    else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
+    CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
    fi
  fi
  
  ### No tcl tk wrap
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_JAVA:BOOL=OFF"
+#CMAKE_OPTIONS+=" -DVTK_WRAP_TCL:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_JAVA:BOOL=OFF"
  
  ### HDF5 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
  # OP 11/04/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
+#CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
  
  ### VisIt Database bridge settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
  
  ### Boost settings (needed when activating VisIt bridge)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
  
  ### gl2ps settings
  # VTK and system gl2ps conflict resolution
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
  if [ -n "$GL2PS_ROOT_DIR" ] 
  then
    # with a native gl2ps, do not use these options
-  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"
+  CMAKE_OPTIONS+=" -DGL2PS_INCLUDE_DIR:STRING=${GL2PS_ROOT_DIR}/include"
+  CMAKE_OPTIONS+=" -DGL2PS_LIBRARY:STRING=${GL2PS_ROOT_DIR}/lib/libgl2ps.so"
  fi
  
  ### libxml2 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
  if [ -n "$LIBXML2_ROOT_DIR" ] 
  then
    # with a native libxml2, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
+  CMAKE_OPTIONS+=" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
+  CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
+  CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
  fi
  
  ### freetype settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
  
  if [ -n "$FREETYPE_ROOT_DIR" ] 
  then
    # with a native freetype, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
+  CMAKE_OPTIONS+=" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
+  CMAKE_OPTIONS+=" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
  fi
  
  ### Extra options (switch off non-used Paraview plug-ins)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
  
  # OP 29/05/2018 Option not used
-#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_PacMan:BOOL=OFF"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=OFF"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_WEB=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_WEB=OFF"
  
  ### Extra options (switch on required Paraview plug-ins)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
  
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
  
  # OP 10/04/2018 Add cgns prerequisite for import/export in CGNS format
  # OP 10/04/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CGNS=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_FIND_REQUIRED:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_INCLUDE_DIR:STRING=${CGNS_ROOT_DIR}/include"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_LIBRARY:STRING=${CGNS_ROOT_DIR}/lib/libcgns.so"
+#CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CGNS=ON"
+CMAKE_OPTIONS+=" -DCGNS_FIND_REQUIRED:BOOL=ON"
+CMAKE_OPTIONS+=" -DCGNS_INCLUDE_DIR:STRING=${CGNS_ROOT_DIR}/include"
+CMAKE_OPTIONS+=" -DCGNS_LIBRARY:STRING=${CGNS_ROOT_DIR}/lib/libcgns.so"
  # OP TEST
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_CGNS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_CGNS:BOOL=ON"
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
  cmake ${CMAKE_OPTIONS} $SOURCE_DIR
diff --git a/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh b/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh

index f88ce12a19db50bc0e187c3734260232664f15d5..ed07de1e05ec0a2bc323bc474eedf0d5773fc693 100755 (executable)
--- a/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh
+++ b/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh
@@ -12,91 +12,91 @@ export python_name=python$PYTHON_VERSION
  CMAKE_OPTIONS=""
  
  ### verbose log
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
  
  ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
  if [ -n "$SAT_DEBUG" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Debug"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
  fi
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  
  ### compiler settings
  # OP TEST
  #if [[ $BITS == "64" ]]
  #then
-#    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-#    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+#    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+#    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  #fi
  # OP 29/05/2018 Add 2 options used by BO
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  
  ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
      # OP 11/04/2018 Option not used
-    #    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
+    #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
      # OP 29/05/2018 Option not used
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=ON"
+    #CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=ON"
      # OP 29/05/2018 Add option used by BO
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=ON"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
      # OP 11/04/2018 Option not used
-    #    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+    #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
      # OP 29/05/2018 Option not used
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=OFF"
+    #CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=OFF"
      # OP 29/05/2018 Add option used by BO
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
  fi
  
  ### VTK general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_FULL_THREADSAFE=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
+CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
+CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE=ON"
+CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
  
  # OP inhibit embedded Pygments and use the system (or SALOME) one
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON"
  
  # TA - OP 17/01/2018 Add options for ParaView libraries installation
  #         due to latest version of ParaView-b5c4c893
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_INSTALL_LIBRARY_DIR=lib/paraview-${PVLIBVERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_INSTALL_ARCHIVE_DIR=lib/paraview-${PVLIBVERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_PLUGINS_DIR=lib/paraview-${PVLIBVERSION}/plugins"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTKm_INSTALL_LIB_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_INSTALL_LIBRARY_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_INSTALL_ARCHIVE_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_PLUGINS_DIR=lib/paraview-${PVLIBVERSION}/plugins"
+CMAKE_OPTIONS+=" -DVTKm_INSTALL_LIB_DIR=lib/paraview-${PVLIBVERSION}"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
  
  ### OpenGL2 backend for performance improvment
  # https://blog.kitware.com/new-opengl-rendering-in-vtk/ 
  # OpenGl2 mandatory in this version of paraview
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_RENDERING_BACKEND:STRING=OpenGL2"
+CMAKE_OPTIONS+=" -DVTK_RENDERING_BACKEND:STRING=OpenGL2"
  ### OpenMP to speed computation of some filters
  # https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
  # https://blog.kitware.com/accelerated-filters-in-paraview-5/
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
+#CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
  
  ### Qt settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
  if [ -n "$QT5_ROOT_DIR" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_QT_VERSION=5"
+    CMAKE_OPTIONS+=" -DPARAVIEW_QT_VERSION=5"
      # OP 29/05/2018 Add option used by BO
      CMAKE_OPTIONS="${CMAKE_OPTIONS} -DQT_HELP_GENERATOR:STRING=${QT5_ROOT_DIR}/bin/qhelpgenerator"
  fi
@@ -104,7 +104,7 @@ fi
  CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF"
  
  ### Python settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
  
  # OP 29/05/2018 Add option used by BO
  CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON"
@@ -112,93 +112,93 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON"
  if [ -n "$PYTHONHOME" ] 
  then
    # with a native python, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
    if [ ${PYTHON_VERSION%%.*} == 3 ]
    then
      # OP TEST
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config-${PYTHON_VERSION}/lib${python_name}.so"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/lib${python_name}.so"
+    #CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config-${PYTHON_VERSION}/lib${python_name}.so"
+    CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/lib${python_name}.so"
    else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
+    CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
    fi
  fi
  
  ### No tcl tk wrap
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_JAVA:BOOL=OFF"
+#CMAKE_OPTIONS+=" -DVTK_WRAP_TCL:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_JAVA:BOOL=OFF"
  
  ### HDF5 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
  # OP 11/04/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
+#CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
  
  ### VisIt Database bridge settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
  
  ### Boost settings (needed when activating VisIt bridge)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
  
  ### gl2ps settings
  # VTK and system gl2ps conflict resolution
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
  if [ -n "$GL2PS_ROOT_DIR" ] 
  then
    # with a native gl2ps, do not use these options
-  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"
+  CMAKE_OPTIONS+=" -DGL2PS_INCLUDE_DIR:STRING=${GL2PS_ROOT_DIR}/include"
+  CMAKE_OPTIONS+=" -DGL2PS_LIBRARY:STRING=${GL2PS_ROOT_DIR}/lib/libgl2ps.so"
  fi
  
  ### libxml2 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
  if [ -n "$LIBXML2_ROOT_DIR" ] 
  then
    # with a native libxml2, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
+  CMAKE_OPTIONS+=" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
+  CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
+  CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
  fi
  
  ### freetype settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
  
  if [ -n "$FREETYPE_ROOT_DIR" ] 
  then
    # with a native freetype, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
+  CMAKE_OPTIONS+=" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
+  CMAKE_OPTIONS+=" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
  fi
  
  ### Extra options (switch off non-used Paraview plug-ins)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
  
  # OP 29/05/2018 Option not used
-#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_PacMan:BOOL=OFF"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=OFF"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_WEB=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_WEB=OFF"
  
  ### Extra options (switch on required Paraview plug-ins)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
  
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_CGNS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_CGNS:BOOL=ON"
  if [ -n "$CGNS_ROOT_DIR" ] 
  then
    # with a native cgns, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_FIND_REQUIRED:BOOL=ON"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_INCLUDE_DIR:STRING=${CGNS_ROOT_DIR}/include"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_LIBRARY:STRING=${CGNS_ROOT_DIR}/lib/libcgns.so"
+  CMAKE_OPTIONS+=" -DCGNS_FIND_REQUIRED:BOOL=ON"
+  CMAKE_OPTIONS+=" -DCGNS_INCLUDE_DIR:STRING=${CGNS_ROOT_DIR}/include"
+  CMAKE_OPTIONS+=" -DCGNS_LIBRARY:STRING=${CGNS_ROOT_DIR}/lib/libcgns.so"
  fi
  
  
@@ -206,8 +206,8 @@ fi
  if [ -n "$OSPRAY_ROOT_DIR" ] 
  then
      echo "WARNING: OSPRAY plugin requested..."
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_OSPRAY=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOSPRAY_INSTALL_DIR=$OSPRAY_ROOT_DIR"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_OSPRAY=ON"
+    CMAKE_OPTIONS+=" -DOSPRAY_INSTALL_DIR=$OSPRAY_ROOT_DIR"
  fi
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
diff --git a/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh b/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh

index a474f993f9ee9875a6846c51b1c3bfae63006103..7a0611896c98b80f013bf83d1b49d652515f2d71 100755 (executable)
--- a/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh
+++ b/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh
@@ -12,91 +12,91 @@ export python_name=python$PYTHON_VERSION
  CMAKE_OPTIONS=""
  
  ### verbose log
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
  
  ### common settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
  if [ -n "$SAT_DEBUG" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Debug"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
  fi
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
  
  
  ### compiler settings
  # OP TEST
  #if [[ $BITS == "64" ]]
  #then
-#    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-#    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+#    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+#    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  #fi
  # OP 29/05/2018 Add 2 options used by BO
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS:STRING=-m64"
+CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS:STRING=-m64"
  
  ### Paraview general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
      # OP 11/04/2018 Option not used
-    #    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
+    #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
      # OP 29/05/2018 Option not used
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=ON"
+    #CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=ON"
      # OP 29/05/2018 Add option used by BO
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=ON"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_MPI:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=OFF"
      # OP 11/04/2018 Option not used
-    #    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+    #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
      # OP 29/05/2018 Option not used
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=OFF"
+    #CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGenerator:BOOL=OFF"
      # OP 29/05/2018 Add option used by BO
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
  fi
  
  ### VTK general settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_FULL_THREADSAFE=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
+CMAKE_OPTIONS+=" -DVTK_USE_64BIT_IDS:BOOL=OFF"       # issue 1779
+CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE=ON"
+CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"  # Make sure Python is thread-safe in ParaView
  
  # OP inhibit embedded Pygments and use the system (or SALOME) one
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON"
  
  # TA - OP 17/01/2018 Add options for ParaView libraries installation
  #         due to latest version of ParaView-b5c4c893
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_INSTALL_LIBRARY_DIR=lib/paraview-${PVLIBVERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_INSTALL_ARCHIVE_DIR=lib/paraview-${PVLIBVERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_PLUGINS_DIR=lib/paraview-${PVLIBVERSION}/plugins"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTKm_INSTALL_LIB_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_INSTALL_LIBRARY_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_INSTALL_ARCHIVE_DIR=lib/paraview-${PVLIBVERSION}"
+CMAKE_OPTIONS+=" -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages"
+CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_PLUGINS_DIR=lib/paraview-${PVLIBVERSION}/plugins"
+CMAKE_OPTIONS+=" -DVTKm_INSTALL_LIB_DIR=lib/paraview-${PVLIBVERSION}"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF"
  
  ### OpenGL2 backend for performance improvment
  # https://blog.kitware.com/new-opengl-rendering-in-vtk/ 
  # OpenGl2 mandatory in this version of paraview
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_RENDERING_BACKEND:STRING=OpenGL2"
+CMAKE_OPTIONS+=" -DVTK_RENDERING_BACKEND:STRING=OpenGL2"
  ### OpenMP to speed computation of some filters
  # https://blog.kitware.com/simple-parallel-computing-with-vtksmptools-2/
  # https://blog.kitware.com/accelerated-filters-in-paraview-5/
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
+#CMAKE_OPTIONS+=" -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP" 
  
  ### Qt settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
  if [ -n "$QT5_ROOT_DIR" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_QT_VERSION=5"
+    CMAKE_OPTIONS+=" -DPARAVIEW_QT_VERSION=5"
      # OP 29/05/2018 Add option used by BO
      CMAKE_OPTIONS="${CMAKE_OPTIONS} -DQT_HELP_GENERATOR:STRING=${QT5_ROOT_DIR}/bin/qhelpgenerator"
  fi
@@ -104,7 +104,7 @@ fi
  CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF"
  
  ### Python settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
  
  # OP 29/05/2018 Add option used by BO
  CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON"
@@ -112,94 +112,94 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON"
  if [ -n "$PYTHONHOME" ] 
  then
    # with a native python, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/${python_name}"
+  CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/${python_name}"
    if [ ${PYTHON_VERSION%%.*} == 3 ]
    then
      # OP TEST
-    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config-${PYTHON_VERSION}/lib${python_name}.so"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/lib${python_name}.so"
+    #CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config-${PYTHON_VERSION}/lib${python_name}.so"
+    CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/lib${python_name}.so"
    else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
+    CMAKE_OPTIONS+=" -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/${python_name}/config/lib${python_name}.so"
    fi
  fi
  
  ### No tcl tk wrap
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_JAVA:BOOL=OFF"
+#CMAKE_OPTIONS+=" -DVTK_WRAP_TCL:BOOL=OFF"
+CMAKE_OPTIONS+=" -DVTK_WRAP_JAVA:BOOL=OFF"
  
  ### HDF5 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
  # OP 11/04/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
+#CMAKE_OPTIONS+=" -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5"
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
  
  ### VisIt Database bridge settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
  
  ### Boost settings (needed when activating VisIt bridge)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DBOOST_ROOT=${BOOST_ROOT_DIR}"
  
  ### gl2ps settings
  # VTK and system gl2ps conflict resolution
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
  if [ -n "$GL2PS_ROOT_DIR" ] 
  then
    # with a native gl2ps, do not use these options
-  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"
+  CMAKE_OPTIONS+=" -DGL2PS_INCLUDE_DIR:STRING=${GL2PS_ROOT_DIR}/include"
+  CMAKE_OPTIONS+=" -DGL2PS_LIBRARY:STRING=${GL2PS_ROOT_DIR}/lib/libgl2ps.so"
  fi
  
  ### libxml2 settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
  if [ -n "$LIBXML2_ROOT_DIR" ] 
  then
    # with a native libxml2, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
+  CMAKE_OPTIONS+=" -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
+  CMAKE_OPTIONS+=" -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
+  CMAKE_OPTIONS+=" -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
  fi
  
  ### freetype settings
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON"
  
  if [ -n "$FREETYPE_ROOT_DIR" ] 
  then
    # with a native freetype, do not use these options
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
+  CMAKE_OPTIONS+=" -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"
+  CMAKE_OPTIONS+=" -DFREETYPE_LIBRARY:STRING=${FREETYPE_ROOT_DIR}/lib/libfreetype.so"
  fi
  
  ### Extra options (switch off non-used Paraview plug-ins)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
  
  # OP 29/05/2018 Option not used
-#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_PacMan:BOOL=OFF"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=OFF"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_WEB=OFF"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_WEB=OFF"
  
  ### Extra options (switch on required Paraview plug-ins)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
  
  # OP 29/05/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
+#CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON"
  
  # OP 10/04/2018 Add cgns prerequisite for import/export in CGNS format
  # OP 10/04/2018 Option not used
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_CGNS=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_FIND_REQUIRED:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_INCLUDE_DIR:STRING=${CGNS_ROOT_DIR}/include"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_LIBRARY:STRING=${CGNS_ROOT_DIR}/lib/libcgns.so"
+#CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CGNS=ON"
+CMAKE_OPTIONS+=" -DCGNS_FIND_REQUIRED:BOOL=ON"
+CMAKE_OPTIONS+=" -DCGNS_INCLUDE_DIR:STRING=${CGNS_ROOT_DIR}/include"
+CMAKE_OPTIONS+=" -DCGNS_LIBRARY:STRING=${CGNS_ROOT_DIR}/lib/libcgns.so"
  # OP TEST
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_CGNS:BOOL=ON"
+CMAKE_OPTIONS+=" -DVTK_USE_SYSTEM_CGNS:BOOL=ON"
  echo
  echo "*** cmake" ${CMAKE_OPTIONS}
  cmake ${CMAKE_OPTIONS} $SOURCE_DIR
diff --git a/products/compil_scripts/SOLVERLAB.sh b/products/compil_scripts/SOLVERLAB.sh

index 08de173c87dd40fcb84f3cf68b7b461730c61814..f8ccdd763b563b03aeb3aff9b1f15ec85efeab16 100755 (executable)
--- a/products/compil_scripts/SOLVERLAB.sh
+++ b/products/compil_scripts/SOLVERLAB.sh
@@ -5,29 +5,29 @@ echo "SOLVERLAB" $VERSION
  echo "##########################################################################"
  
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPython_ROOT_DIR=${PYTHON_ROOT_DIR}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPython_EXECUTABLE=${PYTHONBIN}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DPython_ROOT_DIR=${PYTHON_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DPython_EXECUTABLE=${PYTHONBIN}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}"
  
  if [ $VERSION == "V9_6_0" ]
  then
      # GUI was ported after 9.6.0
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCOREFLOWS_WITH_GUI=OFF"
+    CMAKE_OPTIONS+=" -DCOREFLOWS_WITH_GUI=OFF"
      # following variables are automatically detected in environment after 9.6.0
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYQT5_ROOT_DIR=${PYQT5_ROOT_DIR}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMATPLOTLIB_ROOT_DIR=${MATPLOTLIB_ROOT_DIR}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DDOXYGEN_EXECUTABLE=${DOXYGEN_ROOT_DIR}/bin/doxygen"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCPPUNIT_ROOT_USER=${CPPUNIT_ROOT_DIR}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ROOT=${HDF5_ROOT_DIR}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDFILE_ROOT_DIR=${MEDFILE_ROOT_DIR}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ROOT_DIR=${PARAVIEW_ROOT_DIR}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPETSC_DIR=${PETSC_ROOT_DIR}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DKERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DGUI_ROOT_DIR=${GUI_ROOT_DIR}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDCOUPLING_ROOT_DIR=${MEDCOUPLING_ROOT_DIR}"
+    CMAKE_OPTIONS+=" -DPYQT5_ROOT_DIR=${PYQT5_ROOT_DIR}"
+    CMAKE_OPTIONS+=" -DMATPLOTLIB_ROOT_DIR=${MATPLOTLIB_ROOT_DIR}"
+    CMAKE_OPTIONS+=" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    CMAKE_OPTIONS+=" -DDOXYGEN_EXECUTABLE=${DOXYGEN_ROOT_DIR}/bin/doxygen"
+    CMAKE_OPTIONS+=" -DCPPUNIT_ROOT_USER=${CPPUNIT_ROOT_DIR}"
+    CMAKE_OPTIONS+=" -DHDF5_ROOT=${HDF5_ROOT_DIR}"
+    CMAKE_OPTIONS+=" -DMEDFILE_ROOT_DIR=${MEDFILE_ROOT_DIR}"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ROOT_DIR=${PARAVIEW_ROOT_DIR}"
+    CMAKE_OPTIONS+=" -DPETSC_DIR=${PETSC_ROOT_DIR}"
+    CMAKE_OPTIONS+=" -DKERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}"
+    CMAKE_OPTIONS+=" -DGUI_ROOT_DIR=${GUI_ROOT_DIR}"
+    CMAKE_OPTIONS+=" -DMEDCOUPLING_ROOT_DIR=${MEDCOUPLING_ROOT_DIR}"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCOREFLOWS_WITH_GUI=ON"
+    CMAKE_OPTIONS+=" -DCOREFLOWS_WITH_GUI=ON"
  fi
  
  if [ -n "$SAT_HPC" ]
diff --git a/products/compil_scripts/URANIE.sh b/products/compil_scripts/URANIE.sh

index b2b5340e98373b57243a2b147f9b080c1f63f348..6c3979a470fbb715d3e76f82a44c2faae79dab23 100755 (executable)
--- a/products/compil_scripts/URANIE.sh
+++ b/products/compil_scripts/URANIE.sh
@@ -5,11 +5,11 @@ echo "URANIE " $VERSION
  echo "##########################################################################"
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH-OPT++:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH-JSONCPP:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -D--enable-doc:BOOL=ON"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DWITH-OPT++:BOOL=ON"
+CMAKE_OPTIONS+=" -DWITH-JSONCPP:BOOL=ON"
+CMAKE_OPTIONS+=" -D--enable-doc:BOOL=ON"
  
  rm -rf $BUILD_DIR
  mkdir -p $BUILD_DIR
diff --git a/products/compil_scripts/cgns.sh b/products/compil_scripts/cgns.sh

index bcb2da7fb9c7787de459f9487afe3eae04bec798..e42493103de33abadb38b8dcf8c29b06b2ebbd52 100755 (executable)
--- a/products/compil_scripts/cgns.sh
+++ b/products/compil_scripts/cgns.sh
@@ -9,18 +9,18 @@ echo "##########################################################################
  echo "cgnslib compilation"
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
  
  #add hdf5 support (tuleap spns #8161)
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCGNS_ENABLE_HDF5:BOOL=ON"
+CMAKE_OPTIONS+=" -DCGNS_ENABLE_HDF5:BOOL=ON"
  
  if [ -n "$SAT_HPC" ]
  then
      echo "HPC mode, activate -DHDF5_NEEDS_MPI:BOOL=ON option"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_NEEDS_MPI:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DHDF5_NEEDS_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
  fi
  
  echo
diff --git a/products/compil_scripts/eficas.sh b/products/compil_scripts/eficas.sh

index 3a90eca0e42479c0a97d79129ce33f80374d66bb..614e983a02ba1f49329406e888ac5a6707f7ada1 100755 (executable)
--- a/products/compil_scripts/eficas.sh
+++ b/products/compil_scripts/eficas.sh
@@ -7,13 +7,13 @@ echo "##########################################################################
  
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DIN_SALOME_CONTEXT:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_ALL_PACKAGES:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python${PYTHON_VERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DIN_SALOME_CONTEXT:BOOL=ON"
+CMAKE_OPTIONS+=" -DWITH_ALL_PACKAGES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python${PYTHON_VERSION}"
+CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_PATH=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
+CMAKE_OPTIONS+=" -DPYTHON_LIBRARY=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so"
  
  mkdir -p $BUILD_DIR
  cd $BUILD_DIR
diff --git a/products/compil_scripts/eigen.sh b/products/compil_scripts/eigen.sh

index 840e8e99d853393228a844aa844f2faa45d36186..05dcde10dc6dc2f34a6427f7f061c703ba14f9c4 100755 (executable)
--- a/products/compil_scripts/eigen.sh
+++ b/products/compil_scripts/eigen.sh
@@ -9,7 +9,7 @@ echo "##########################################################################
  #cd $SOURCE_DIR
  
  # Install dir
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX=$PRODUCT_INSTALL"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX=$PRODUCT_INSTALL"
  
  echo
  echo "*** cmake ${CMAKE_OPTIONS}"
diff --git a/products/compil_scripts/gl2ps-1.4.0.sh b/products/compil_scripts/gl2ps-1.4.0.sh

index c4f410c57577bc1d5f2f358b27707dcaba3ae13f..c1d50e3eca70d308c6e8a6729451f71aee1f4575 100755 (executable)
--- a/products/compil_scripts/gl2ps-1.4.0.sh
+++ b/products/compil_scripts/gl2ps-1.4.0.sh
@@ -15,11 +15,11 @@ then
      fi
  
      CMAKE_OPTIONS=""
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_PNG=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_ZLIB=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_GLUT=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+    CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+    CMAKE_OPTIONS+=" -DENABLE_PNG=ON"
+    CMAKE_OPTIONS+=" -DENABLE_ZLIB=ON"
+    CMAKE_OPTIONS+=" -DENABLE_GLUT=OFF"
      echo
      echo "*** cmake" ${CMAKE_OPTIONS}
      cmake ${CMAKE_OPTIONS} $SOURCE_DIR
diff --git a/products/compil_scripts/gmsh-2.12.0.sh b/products/compil_scripts/gmsh-2.12.0.sh

index 09c26fe848c05196fe892ed1adec1c16e78cca65..f4496215e1aa2ff638b7faaa189fea35a6be1c11 100755 (executable)
--- a/products/compil_scripts/gmsh-2.12.0.sh
+++ b/products/compil_scripts/gmsh-2.12.0.sh
@@ -7,15 +7,15 @@ echo "##########################################################################
  
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_ACIS=0"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_BUILD_SHARED=1"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_FLTK=0"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_MED=0"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_ONELAB_METAMODEL=0"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_PARSER=0"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_SALOME=0"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_PETSC:BOOL=OFF" #pour éviter de tirer sur MPI
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DENABLE_ACIS=0"
+CMAKE_OPTIONS+=" -DENABLE_BUILD_SHARED=1"
+CMAKE_OPTIONS+=" -DENABLE_FLTK=0"
+CMAKE_OPTIONS+=" -DENABLE_MED=0"
+CMAKE_OPTIONS+=" -DENABLE_ONELAB_METAMODEL=0"
+CMAKE_OPTIONS+=" -DENABLE_PARSER=0"
+CMAKE_OPTIONS+=" -DENABLE_SALOME=0"
+CMAKE_OPTIONS+=" -DENABLE_PETSC:BOOL=OFF" #pour éviter de tirer sur MPI
  
  
  cmake $CMAKE_OPTIONS $SOURCE_DIR
diff --git a/products/compil_scripts/hdf5-1.10.3.sh b/products/compil_scripts/hdf5-1.10.3.sh

index 34e948207b29c8093691b95db552b5bd6184c6ac..a53a0c003751c77382328bf43e82e4d6f672e82a 100755 (executable)
--- a/products/compil_scripts/hdf5-1.10.3.sh
+++ b/products/compil_scripts/hdf5-1.10.3.sh
@@ -7,29 +7,29 @@ echo "##########################################################################
  
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_USE_16_API_DEFAULT:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ALLOW_EXTERNAL_SUPPORT:BOOL=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+#CMAKE_OPTIONS+=" -DHDF5_USE_16_API_DEFAULT:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_ALLOW_EXTERNAL_SUPPORT:BOOL=ON"
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_HL_LIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_BUILD_HL_LIB:BOOL=ON"
  
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ENABLE_PARALLEL:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_CPP_LIB:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_TOOLS:BOOL=ON"
+    CMAKE_OPTIONS+=" -DHDF5_ENABLE_PARALLEL:BOOL=ON"
+    CMAKE_OPTIONS+=" -DHDF5_BUILD_CPP_LIB:BOOL=ON"
+    CMAKE_OPTIONS+=" -DHDF5_BUILD_TOOLS:BOOL=ON"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ENABLE_PARALLEL:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_CPP_LIB:BOOL=ON"
+    CMAKE_OPTIONS+=" -DHDF5_ENABLE_PARALLEL:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DHDF5_BUILD_CPP_LIB:BOOL=ON"
  fi
  
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ENABLE_THREADSAFE:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_ENABLE_THREADSAFE:BOOL=ON"
  # OP Set to permit HDF5_BUILD_HL_LIB and HDF5_BUILD_CPP_LIB options to ON
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DALLOW_UNSUPPORTED:BOOL=ON"
+CMAKE_OPTIONS+=" -DALLOW_UNSUPPORTED:BOOL=ON"
  
  echo
  echo "*** cmake" $CMAKE_OPTIONS
diff --git a/products/compil_scripts/hdf5CMake.sh b/products/compil_scripts/hdf5CMake.sh

index 9c57462ab0a34b8e43cd33144f0103a8cb9569a1..d142bf1caf68783a714ddeb605b8372991ba2f68 100755 (executable)
--- a/products/compil_scripts/hdf5CMake.sh
+++ b/products/compil_scripts/hdf5CMake.sh
@@ -7,24 +7,24 @@ echo "##########################################################################
  
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_USE_16_API_DEFAULT:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ALLOW_EXTERNAL_SUPPORT:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_HL_LIB:BOOL=ON"
+CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+#CMAKE_OPTIONS+=" -DHDF5_USE_16_API_DEFAULT:BOOL=ON"
+CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_ALLOW_EXTERNAL_SUPPORT:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_BUILD_HL_LIB:BOOL=ON"
  
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ENABLE_PARALLEL:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_CPP_LIB:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_TOOLS:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
+    CMAKE_OPTIONS+=" -DHDF5_ENABLE_PARALLEL:BOOL=ON"
+    CMAKE_OPTIONS+=" -DHDF5_BUILD_CPP_LIB:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DHDF5_BUILD_TOOLS:BOOL=ON"
+    CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS:BOOL=ON"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ENABLE_PARALLEL:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_BUILD_CPP_LIB:BOOL=ON"
+    CMAKE_OPTIONS+=" -DHDF5_ENABLE_PARALLEL:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DHDF5_BUILD_CPP_LIB:BOOL=ON"
  fi
  
  echo
diff --git a/products/compil_scripts/medCMake.sh b/products/compil_scripts/medCMake.sh

index b682bf8fb09a4196bff9ff391ad03ca6511209eb..eb5a1cded36718d5b48daa074709301329ebd341 100755 (executable)
--- a/products/compil_scripts/medCMake.sh
+++ b/products/compil_scripts/medCMake.sh
@@ -7,17 +7,17 @@ echo "##########################################################################
  
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDFILE_BUILD_STATIC_LIBS:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDFILE_BUILD_SHARED_LIBS:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ROOT_DIR:STRING=${HDF5_ROOT_DIR}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DMEDFILE_BUILD_STATIC_LIBS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DMEDFILE_BUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS+=" -DHDF5_ROOT_DIR:STRING=${HDF5_ROOT_DIR}"
  
  if [ -n "$SAT_HPC" ]
  then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDFILE_USE_MPI:BOOL=ON"
+    CMAKE_OPTIONS+=" -DMEDFILE_USE_MPI:BOOL=ON"
  else
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDFILE_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DMEDFILE_USE_MPI:BOOL=OFF"
  fi
  
  # OP 20/04/2017 TEST pour overwrite compilateur Fortran sur CO6 avec cmake
diff --git a/products/compil_scripts/opencv-3.2.0-with-ffmpeg.sh b/products/compil_scripts/opencv-3.2.0-with-ffmpeg.sh

index 4e357eaa852cf55b8ecdd93686957c89a0958c60..58a22a6ae755e7a40989a2fcf785d3b3ac0c3301 100755 (executable)
--- a/products/compil_scripts/opencv-3.2.0-with-ffmpeg.sh
+++ b/products/compil_scripts/opencv-3.2.0-with-ffmpeg.sh
@@ -5,24 +5,24 @@ echo "opencv" $VERSION
  echo "##########################################################################"
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_NEW_PYTHON_SUPPORT=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_EXAMPLES:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON3_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON3_NUMPY_INCLUDE_DIRS=${NUMPY_INCLUDE_DIR};${NUMPY_INCLUDE_DIR2}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_IPP:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_opencv_java:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR2=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_FFMPEG:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_LAPACK:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_CUDA:BOOL=OFF"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DBUILD_NEW_PYTHON_SUPPORT=ON"
+CMAKE_OPTIONS+=" -DBUILD_EXAMPLES:BOOL=ON"
+CMAKE_OPTIONS+=" -DPYTHON3_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
+CMAKE_OPTIONS+=" -DPYTHON3_NUMPY_INCLUDE_DIRS=${NUMPY_INCLUDE_DIR};${NUMPY_INCLUDE_DIR2}"
+CMAKE_OPTIONS+=" -DWITH_IPP:BOOL=OFF"
+CMAKE_OPTIONS+=" -DBUILD_opencv_java:BOOL=OFF"
+CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
+CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR2=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
+CMAKE_OPTIONS+=" -DWITH_FFMPEG:BOOL=ON"
+CMAKE_OPTIONS+=" -DWITH_LAPACK:BOOL=ON"
+CMAKE_OPTIONS+=" -DWITH_CUDA:BOOL=OFF"
  # bos 19730
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_VTK:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS=-fPIC"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS=-fPIC"
+CMAKE_OPTIONS+=" -DWITH_VTK:BOOL=OFF"
+CMAKE_OPTIONS+=" -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF"
+CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=-fPIC"
+CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC"
  
  
  rm -rf $BUILD_DIR
diff --git a/products/compil_scripts/opencv.sh b/products/compil_scripts/opencv.sh

index 3118d7aae24dd92ab51eddfc4a55be908971e481..b5ac5e94689af534627858dbd08bfb12c4cc44b7 100755 (executable)
--- a/products/compil_scripts/opencv.sh
+++ b/products/compil_scripts/opencv.sh
@@ -7,38 +7,38 @@ echo "##########################################################################
  function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
  
  if version_ge $VERSION "3."; then
      echo "*** openCV version $VERSION >= 3."
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_NEW_PYTHON_SUPPORT=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_EXAMPLES:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON3_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON3_NUMPY_INCLUDE_DIRS=${NUMPY_INCLUDE_DIR};${NUMPY_INCLUDE_DIR2}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_IPP:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_opencv_java:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIR2=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_FFMPEG:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_LAPACK:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_CUDA:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DBUILD_NEW_PYTHON_SUPPORT=ON"
+    CMAKE_OPTIONS+=" -DBUILD_EXAMPLES:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPYTHON3_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
+    CMAKE_OPTIONS+=" -DPYTHON3_NUMPY_INCLUDE_DIRS=${NUMPY_INCLUDE_DIR};${NUMPY_INCLUDE_DIR2}"
+    CMAKE_OPTIONS+=" -DWITH_IPP:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DBUILD_opencv_java:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
+    CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR2=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
+    CMAKE_OPTIONS+=" -DWITH_FFMPEG:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DWITH_LAPACK:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DWITH_CUDA:BOOL=OFF"
      # bos 19730
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_VTK:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS=-fPIC"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS=-fPIC"
+    CMAKE_OPTIONS+=" -DWITH_VTK:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=-fPIC"
+    CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC"
  
      # 
  else
      echo "*** openCV version $VERSION < 3."
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_CUDA:BOOL=OFF"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DWITH_FFMPEG:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DWITH_CUDA:BOOL=OFF"
+    CMAKE_OPTIONS+=" -DWITH_FFMPEG:BOOL=OFF"
      # OP opencv on Ubuntu
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_DIRS=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_opencv_java=OFF"
+    CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
+    CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIRS=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
+    CMAKE_OPTIONS+=" -DPYTHON_LIBRARY=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so"
+    CMAKE_OPTIONS+=" -DBUILD_opencv_java=OFF"
  fi
  
  
diff --git a/products/compil_scripts/openturns.sh b/products/compil_scripts/openturns.sh

index e4551d2605fe4491f57704c60fd16746da9a11f3..be3a91b6277eded1fc7b97220d5ea40e0dccc844 100755 (executable)
--- a/products/compil_scripts/openturns.sh
+++ b/products/compil_scripts/openturns.sh
@@ -12,10 +12,10 @@ then
  fi
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
+CMAKE_OPTIONS+=" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
  
  echo
  echo "*** cmake" $CMAKE_OPTIONS
diff --git a/products/compil_scripts/planegcs.sh b/products/compil_scripts/planegcs.sh

index 58cc667ac30d9241585187d55277aeec87bebe5c..1e3f13d5b33f335b775947d58097ce644def9c78 100755 (executable)
--- a/products/compil_scripts/planegcs.sh
+++ b/products/compil_scripts/planegcs.sh
@@ -9,7 +9,7 @@ echo "##########################################################################
  cd $SOURCE_DIR
  
  # Install dir
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX=$PRODUCT_INSTALL"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX=$PRODUCT_INSTALL"
  
  echo
  echo "*** cmake " ${CMAKE_OPTIONS}
diff --git a/products/compil_scripts/solvespace-2.1.sh b/products/compil_scripts/solvespace-2.1.sh

index c16efce6be51a16353495ae781c6a435cab99e65..18a9c5b39401fe5e75d6664e844c5566ef918a36 100755 (executable)
--- a/products/compil_scripts/solvespace-2.1.sh
+++ b/products/compil_scripts/solvespace-2.1.sh
@@ -8,9 +8,9 @@ echo "##########################################################################
  
  
  CMAKE_OPTIONS=""
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DONLY_LIB=ON"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
+CMAKE_OPTIONS+=" -DONLY_LIB=ON"
  
  echo '$SOURCE_DIR '  $SOURCE_DIR
  cmake $CMAKE_OPTIONS $SOURCE_DIR
author	Abdoulbari ZAKIR <Abdoulbari.Zakir@cea.fr>
	Wed, 9 Jun 2021 09:07:51 +0000 (11:07 +0200)
committer	Nabil Ghodbane <nabil.ghodbane@cea.fr>
	Fri, 25 Jun 2021 13:50:11 +0000 (15:50 +0200)
products/compil_scripts/ADAO.sh		patch \| blob \| history
products/compil_scripts/ParaView-3.14.0.sh		patch \| blob \| history
products/compil_scripts/ParaView-4.2.0.sh		patch \| blob \| history
products/compil_scripts/ParaView-5.0.sh		patch \| blob \| history
products/compil_scripts/ParaView-5.1-820-offscreen_rendering.sh		patch \| blob \| history
products/compil_scripts/ParaView-5.1-820.sh		patch \| blob \| history
products/compil_scripts/ParaView-5.1.sh		patch \| blob \| history
products/compil_scripts/ParaView-5.4-b5c4c89.sh		patch \| blob \| history
products/compil_scripts/ParaView-5.4.1_b5c4c89.sh		patch \| blob \| history
products/compil_scripts/ParaView-5.5.2p2_7591431.sh		patch \| blob \| history
products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh		patch \| blob \| history
products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh		patch \| blob \| history
products/compil_scripts/SOLVERLAB.sh		patch \| blob \| history
products/compil_scripts/URANIE.sh		patch \| blob \| history
products/compil_scripts/cgns.sh		patch \| blob \| history
products/compil_scripts/eficas.sh		patch \| blob \| history
products/compil_scripts/eigen.sh		patch \| blob \| history
products/compil_scripts/gl2ps-1.4.0.sh		patch \| blob \| history
products/compil_scripts/gmsh-2.12.0.sh		patch \| blob \| history
products/compil_scripts/hdf5-1.10.3.sh		patch \| blob \| history
products/compil_scripts/hdf5CMake.sh		patch \| blob \| history
products/compil_scripts/medCMake.sh		patch \| blob \| history
products/compil_scripts/opencv-3.2.0-with-ffmpeg.sh		patch \| blob \| history
products/compil_scripts/opencv.sh		patch \| blob \| history
products/compil_scripts/openturns.sh		patch \| blob \| history
products/compil_scripts/planegcs.sh		patch \| blob \| history
products/compil_scripts/solvespace-2.1.sh		patch \| blob \| history