Salome HOME
projects
/
tools
/
solverlab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f38ac7b
)
Corrected MPI detection
author
NDJINGA Michael
<ndjinga@is224593.intra.cea.fr>
Thu, 20 Jan 2022 13:49:50 +0000
(14:49 +0100)
committer
NDJINGA Michael
<ndjinga@is224593.intra.cea.fr>
Thu, 20 Jan 2022 13:49:50 +0000
(14:49 +0100)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index bd890b53a6872ddba80ff0d01296af193e1f25a6..237fb4765d731bf93aaca00fcbd76de72dccb559 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-60,9
+60,13
@@
list (APPEND CMAKE_MODULE_PATH "${SOLVERLAB_SOURCE_DIR}/cmake_files")
#############################
# Detection of MPI + MPI4PY #
#############################
#############################
# Detection of MPI + MPI4PY #
#############################
-if ( DEFINED MPI_ROOT_DIR )
- set(MPI_HOME ${MPI_ROOT_DIR})
-endif( DEFINED MPI_ROOT_DIR )
+if ( DEFINED ENV{MPI_ROOT_DIR} OR DEFINED MPI_ROOT_DIR )
+ if ( DEFINED ENV{MPI_ROOT_DIR} )
+ set(MPI_HOME $ENV{MPI_ROOT_DIR})
+ else ( DEFINED ENV{MPI_ROOT_DIR} )
+ set(MPI_HOME ${MPI_ROOT_DIR})
+ endif( DEFINED ENV{MPI_ROOT_DIR} )
+endif( DEFINED ENV{MPI_ROOT_DIR} OR DEFINED MPI_ROOT_DIR )
# Definition of SOLVERLAB_WITH_MPI
if( DEFINED ENV{MPI_HOME} OR MPI_HOME )
# Definition of SOLVERLAB_WITH_MPI
if( DEFINED ENV{MPI_HOME} OR MPI_HOME )