From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 6 Dec 2022 16:32:17 +0000 (+0100)
Subject: spns #32377: cgns detection uses CGNS_ROOT
X-Git-Tag: V9_11_0~161
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f220e22d8bddf097339988f6b076e1e4ecb54e01;p=tools%2Fsat_salome.git

spns #32377: cgns detection uses CGNS_ROOT
---

diff --git a/products/compil_scripts/gmsh-4.10.3.sh b/products/compil_scripts/gmsh-4.10.3.sh
index 2eacc23..4dcc6c0 100755
--- a/products/compil_scripts/gmsh-4.10.3.sh
+++ b/products/compil_scripts/gmsh-4.10.3.sh
@@ -25,11 +25,9 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_PARSER=ON"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_PETSC=OFF"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_PRIVATE_API=ON"
 if [ -n "$CGNS_ROOT_DIR" ]; then
+    # GMSH relies on the presence of this environment variable.
+    export CGNS_ROOT=$CGNS_ROOT_DIR
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_CGNS=ON"
-    if [ "${SAT_cgns_IS_NATIVE}" != "1" ]; then
-	CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include"
-	CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib/libcgns.so"
-    fi
 else
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_CGNS=OFF"
 fi
diff --git a/products/env_scripts/cgns.py b/products/env_scripts/cgns.py
index ecc65e0..576d8f3 100644
--- a/products/env_scripts/cgns.py
+++ b/products/env_scripts/cgns.py
@@ -4,7 +4,6 @@
 import os.path, platform
 
 def set_env(env, prereq_dir, version):
-  env.set('CGNS_ROOT', prereq_dir)
   env.set('CGNS_ROOT_DIR', prereq_dir)
   env.set('CGNS_INCLUDE_DIR',os.path.join(prereq_dir,'include'))
   env.prepend('PATH', os.path.join(prereq_dir, 'bin'))