Merge branch 'V9_6_BR'

[tools/sat_salome.git] / products / compil_scripts / ParaView.sh

diff --git a/products/compil_scripts/ParaView.sh b/products/compil_scripts/ParaView.sh
index 959a954699f3193ee8f66075735af2dccfe0ae68..c37f2f3e598c6a145cd83def81cb748a5d767ef4 100755 (executable)
--- a/products/compil_scripts/ParaView.sh
+++ b/products/compil_scripts/ParaView.sh
@@ -12,7 +12,12 @@ CMAKE_OPTIONS=""
 ### common compiler and install settings
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
-CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE:STRING=Release"
+if [ -n "$SAT_DEBUG" ]
+then
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE:STRING=Debug"
+else
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE:STRING=Release"
+fi
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS:STRING=-m64"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_FLAGS:STRING=-m64"
 
@@ -101,7 +106,13 @@ then
     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`"
-    if [[ $VTK_SMP_IMPLEMENTATION_TYPE = "TBB" ]]
+    if [[ $VTK_SMP_IMPLEMENTATION_TYPE = "sequential" ]]
+    then
+        echo "WARNING: sequential approach will be used..."
+        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`"
+    elif [[ $VTK_SMP_IMPLEMENTATION_TYPE = "TBB" ]]
     then
         echo "WARNING: VTK_SMP_IMPLEMENTATION_TYPE was set to: TBB..."
         CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=TBB -DVTKm_ENABLE_TBB:BOOL=ON"