-# Copyright (C) 2010-2021 CEA/DEN, EDF R&D
+# Copyright (C) 2010-2022 CEA/DEN, EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# Versioning
# ===========
-SALOME_SETUP_VERSION(9.8.0 DEVELOPMENT)
+SALOME_SETUP_VERSION(9.10.0)
MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
# Find KERNEL
OPTION(SALOME_PARAVIS_BUILD_CORBA_PLUGINS "Build PARAVIS CORBA plugins (ParaMEDCorba -- this requires the SALOME FIELDS module)" ON)
OPTION(SALOME_PARAVIS_USE_GEOM_SOURCE "Import a GEOMETRY object to PARAVIS via its Corba IOR" OFF)
OPTION(SALOME_PARAVIS_USE_SMESH_SOURCE "Import a MESH object to PARAVIS via its Corba IOR" OFF)
+option(SALOME_USE_MPI "Activate parallel reading for MEDREADER" OFF)
CMAKE_DEPENDENT_OPTION(SALOME_LIGHT_ONLY "Build SALOME Light only (no CORBA)" OFF
"NOT SALOME_KERNEL_LIGHT_ONLY" ON)
##
FIND_PACKAGE(SalomeParaView REQUIRED)
-
##
## From MEDCoupling / MEDFile / or MEDModule (if CORBA plugin required):
##
# If CORBA plugins required, take in MED module
IF(SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
SET(FIELDS_ROOT_DIR $ENV{FIELDS_ROOT_DIR} CACHE PATH "Path to the SALOME FIELDS module")
- IF(EXISTS ${FIELDS_ROOT_DIR})
- FIND_PACKAGE(SalomeFIELDS)
+ IF(EXISTS ${FIELDS_ROOT_DIR})
+ set(SALOME_USE_MPI_BEFORE ${SALOME_USE_MPI})
+ #SalomeFIELDS may break SALOME_USE_MPI var !
+ FIND_PACKAGE(SalomeFIELDS)
+ set(SALOME_USE_MPI ${SALOME_USE_MPI_BEFORE})
+ unset(SALOME_USE_MPI_BEFORE)
SALOME_LOG_OPTIONAL_PACKAGE(SalomeFIELDS SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
- IF(SALOME_USE_MPI)
- SET(SALOME_PARAVIS_BUILD_INSITU ON)
- ENDIF(SALOME_USE_MPI)
+ #IF(SALOME_USE_MPI)
+ # SET(SALOME_PARAVIS_BUILD_INSITU ON)
+ #ENDIF(SALOME_USE_MPI)
ENDIF()
ELSE(SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
SET(MEDCOUPLING_ROOT_DIR $ENV{MEDCOUPLING_ROOT_DIR} CACHE PATH "Path to the MEDCoupling tool")