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 2eacc2322eb8c1500f25edbe39ea572dc343823c..4dcc6c045d8c4bc93731e4587a7f074636e7837c 100755 (executable)
--- 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
 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"
     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
 else
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_CGNS=OFF"
 fi

diff --git a/products/env_scripts/cgns.py b/products/env_scripts/cgns.py
index ecc65e0ef8b33f23d54bb9bb392d60add035406c..576d8f3b3edb717d89dd508ba786e3c2d4b96c8e 100644 (file)
--- 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):
 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'))
   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'))