ParaView 5.11: Catalyst on demand

diff --git a/applications/SALOME-9.10.0-native.pyconf b/applications/SALOME-9.10.0-native.pyconf
index 257a020619905ef074478289a3b7fa660bb6e631..d7a346085865df8b6f20b3bce170d311a50ef636 100644 (file)
--- a/applications/SALOME-9.10.0-native.pyconf
+++ b/applications/SALOME-9.10.0-native.pyconf
@@ -24,7 +24,7 @@ APPLICATION :
         }
         launch :
         {
-            PYTHONIOENCODING:"UTF_8",
+            PYTHONIOENCODING:"UTF_8"
             SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"
             ROOT_SALOME_INSTALL: '$PRODUCT_ROOT_DIR'
         }

diff --git a/applications/SALOME-9.10.0-windows.pyconf b/applications/SALOME-9.10.0-windows.pyconf
index 70e1814be8034cde39cf5774b41a5de6e901e585..49084e5abcfab47cb227c329f97cf5bc89a06d31 100644 (file)
--- a/applications/SALOME-9.10.0-windows.pyconf
+++ b/applications/SALOME-9.10.0-windows.pyconf
@@ -25,7 +25,7 @@ APPLICATION :
         }
         launch :
         {
-            PYTHONIOENCODING:"UTF_8",
+            PYTHONIOENCODING:"UTF_8"
             SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"
         }
         SALOME_trace : "local" # local/file:.../with_logger

diff --git a/products/compil_scripts/ParaView-5.11.0.sh b/products/compil_scripts/ParaView-5.11.0.sh
index 80c43da612ac1ad559b0129e9ab86f631aedf01e..bd934d1cb8f5a6cadee8e7b78a8d12123830c925 100755 (executable)
--- a/products/compil_scripts/ParaView-5.11.0.sh
+++ b/products/compil_scripts/ParaView-5.11.0.sh
@@ -28,15 +28,21 @@ CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
 
 ### OpenGL settings
 CMAKE_OPTIONS+=" -DOpenGL_GL_PREFERENCE:STRING=LEGACY"
-CMAKE_OPTIONS+=" -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON"
 
 echo "INFO: setting CATALYST"
-CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGeneratorPlugin=ON"
-CMAKE_OPTIONS+=" -DPARAVIEW_AUTOLOAD_PLUGIN_CatalystScriptGeneratorPlugin=ON"
-CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_CATALYST_ADAPTORS=ON"
-CMAKE_OPTIONS+=" -DUSE_CATALYST:BOOL=ON"
-CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST=ON"
-CMAKE_OPTIONS+=" -Dcatalyst_DIR=${CATALYST_ROOT_DIR}/lib/cmake/catalyst-2.0"
+CMAKE_OPTIONS+=" -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON"
+
+if [ "${CATALYST_ROOT_DIR}" != "" ]; then
+    echo "INFO: setting CATALYST advanced options"
+    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGeneratorPlugin=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_AUTOLOAD_PLUGIN_CatalystScriptGeneratorPlugin=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_CATALYST_ADAPTORS=ON"
+    CMAKE_OPTIONS+=" -DUSE_CATALYST:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST=ON"
+    CMAKE_OPTIONS+=" -Dcatalyst_DIR=${CATALYST_ROOT_DIR}/lib/cmake/catalyst-2.0"
+else
+    echo "INFO: CATALYST OPTIONS NOT SET!"
+fi
 
 ### spns #20550 - Headless mode
 if [ "$PARAVIEW_HEADLESS_MODE" == "1" ]; then