From c3597c546e558cf3d4adab0fb9629431ab61687b Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 31 Jan 2022 14:34:24 +0100
Subject: [PATCH] add MPI_C_FOUND environment variable a la EDF

---
 products/GUI.pyconf             | 11 +++++++++--
 products/env_scripts/openmpi.py |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/products/GUI.pyconf b/products/GUI.pyconf
index 64e370c..a760b64 100644
--- a/products/GUI.pyconf
+++ b/products/GUI.pyconf
@@ -2,7 +2,7 @@ default :
 {
     name : "GUI"
     build_source : "cmake"
-    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DMPI_C_FOUND=${MPI_C_FOUND}"
     get_source : "git"
     git_info:
     {
@@ -72,13 +72,20 @@ default_win :
 
 }
 
+version_9_6_0_to_9_8_0:
+{
+    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+}
+
 version_V9_5_0:
 {
-  patches: ['gui-SVTK-VTKView.patch'] # backporting bos #19139
+    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    patches: ['gui-SVTK-VTKView.patch'] # backporting bos #19139
 }
 
 version_8_5_0_to_9_4_0 :
 {
+    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
     depend : ["KERNEL",
               "Python",
               "qt",
diff --git a/products/env_scripts/openmpi.py b/products/env_scripts/openmpi.py
index 45c7b23..7e26a0a 100644
--- a/products/env_scripts/openmpi.py
+++ b/products/env_scripts/openmpi.py
@@ -8,6 +8,7 @@ def set_env(env, prereq_dir, version):
     env.set('OPAL_PREFIX', prereq_dir) # be able to move openmpi install (packages)
     env.set('MPI_ROOT_DIR', prereq_dir)  # update for cmake  
     env.set('MPI_ROOT', prereq_dir)
+    env.set('MPI_C_FOUND', os.path.join(prereq_dir,'lib','libmpi.so'))
     root = env.get('OPENMPIDIR')
     
     env.prepend('PATH', os.path.join(root, 'bin'))
@@ -28,5 +29,6 @@ def set_nativ_env(env):
     env.set('MPI_ROOT_DIR', prereq_dir)
     env.set('OPENMPIDIR', prereq_dir)
     env.set('MPI_ROOT', prereq_dir)
+    env.set('MPI_C_FOUND', os.path.join(prereq_dir,'lib','libmpi.so'))
     env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
     env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir,'lib'))
-- 
2.39.2