From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 13 Jan 2021 12:59:52 +0000 (+0100)
Subject: spns #20550 Version EGL headless offscreen de paraview - remove useless flags
X-Git-Tag: V9_7_0~158
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eea59f4c83ea9a26fb6a2cc749c78923b2898bb8;p=tools%2Fsat_salome.git

spns #20550 Version EGL headless offscreen de paraview - remove useless flags
---

diff --git a/products/compil_scripts/ParaView.sh b/products/compil_scripts/ParaView.sh
index 6ff91c2..ea7506e 100755
--- a/products/compil_scripts/ParaView.sh
+++ b/products/compil_scripts/ParaView.sh
@@ -34,18 +34,12 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DOpenGL_GL_PREFERENCE:STRING=LEGACY"
 if [ -n "$PARAVIEW_HEADLESS_MODE" ]
 then
     EGL_FOUND=false
-    EGL_INCLUDE_ROOT_DIR=
-    EGL_LIBRARY_ROOT_DIR=
-    OPENGL_LIBRARY_ROOT_DIR=
     LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
     case $LINUX_DISTRIBUTION in
         CO6|CO7|FD26|FD30|FD32)
             if [ -f /usr/include/EGL/egl.h ] && [ -f /usr/lib64/libEGL.so ] && [ -f /usr/lib64/libOpenGL.so ]
             then
                 EGL_FOUND=true
-                EGL_INCLUDE_ROOT_DIR=/usr/include
-                EGL_LIBRARY_ROOT_DIR=/usr/lib64
-                OPENGL_LIBRARY_ROOT_DIR=/usr/lib64
             fi
             ;;
         *)
@@ -54,11 +48,8 @@ then
     if [ $EGL_FOUND == "true" ]; then
         echo "WARNING: Building with headless mode support..."
         CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_OPENGL_HAS_EGL:BOOL=ON"
-        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DEGL_INCLUDE_DIR=${EGL_INCLUDE_ROOT_DIR}"
-        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DEGL_LIBRARY=${EGL_LIBRARY_ROOT_DIR}/libEGL.so"
-        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DEGL_opengl_LIBRARY=${OPENGL_LIBRARY_ROOT_DIR}/libOpenGL.so"
     else
-        echo "FATAL: Headless mode cannot be set on node $LINUX_DISTRIBUTION! Please set EGL_INCLUDE_ROOT_DIR, EGL_LIBRARY_ROOT_DIR and OPENGL_LIBRARY_ROOT_DIR environment variables in script: $0"
+        echo "FATAL: Headless mode cannot be set on node $LINUX_DISTRIBUTION! Please expand the PARAVIEW_HEADLESS_MODE section in script: $0"
         exit 1
     fi
 fi