merge from master

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

diff --git a/products/compil_scripts/ParaView-5.11.0.sh b/products/compil_scripts/ParaView-5.11.0.sh
index 8cffe1c5936095185f53dd2ee97c803b72c76a71..bb078bf890cce11fcb7396a05976b0654dfe46c7 100755 (executable)
--- a/products/compil_scripts/ParaView-5.11.0.sh
+++ b/products/compil_scripts/ParaView-5.11.0.sh
@@ -36,6 +36,7 @@ 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"
 
 ### spns #20550 - Headless mode
 if [ -n "$PARAVIEW_HEADLESS_MODE" ]; then
@@ -109,6 +110,7 @@ if [ "${SAT_Python_IS_NATIVE}" != "1" ]
 then
     CMAKE_OPTIONS+=" -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
     CMAKE_OPTIONS+=" -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so"
+    CMAKE_OPTIONS+=" -DPython3_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python${PYTHON_VERSION}"
 fi
 CMAKE_OPTIONS+=" -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON"
 CMAKE_OPTIONS+=" -DVTK_NO_PYTHON_THREADS:BOOL=OFF"