From: ageay Date: Wed, 21 Mar 2012 14:27:21 +0000 (+0000) Subject: Cmakization of MED. X-Git-Tag: V6_5_0a1~17 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=08a84ea1d20f28796e85aea4e2fd24567045cb57;p=modules%2Fkernel.git Cmakization of MED. --- diff --git a/salome_adm/cmake_files/FindMPI.cmake b/salome_adm/cmake_files/FindMPI.cmake index 49ff14d74..679956c31 100644 --- a/salome_adm/cmake_files/FindMPI.cmake +++ b/salome_adm/cmake_files/FindMPI.cmake @@ -85,7 +85,8 @@ IF(MPI_STATUS) MESSAGE(STATUS "MPI include ${MPI_INCLUDE_TO_FIND} found in ${MPI_INCLUDES}") SET(MPI_INCLUDE_DIR ${MPI_INCLUDES}) - SET(MPI_INCLUDES -I${MPI_INCLUDES}) + SET(MPI_INCLUDES_DIR ${MPI_INCLUDES}) + SET(MPI_INCLUDES -I${MPI_INCLUDES})# to remove # ------ @@ -103,16 +104,20 @@ IF(MPI_STATUS) IF(MPI_LIB_FOUND) IF(MPI_LIB_mpi_cxx AND MPI_LIB_mpi) SET(MPI_LIBS ${MPI_LIB_mpi_cxx} ${MPI_LIB_mpi}) - SET(MPI_INCLUDES ${MPI_INCLUDES} -DOMPI_IGNORE_CXX_SEEK) + SET(MPI_INCLUDES ${MPI_INCLUDES} -DOMPI_IGNORE_CXX_SEEK)# to remove + SET(MPI_FLAGS -DOMPI_IGNORE_CXX_SEEK) ELSEIF(MPI_LIB_mpi_cxx) SET(MPI_LIBS ${MPI_LIB_mpi_cxx}) - SET(MPI_INCLUDES ${MPI_INCLUDES} -DOMPI_IGNORE_CXX_SEEK) + SET(MPI_INCLUDES ${MPI_INCLUDES} -DOMPI_IGNORE_CXX_SEEK)# to remove + SET(MPI_FLAGS -DOMPI_IGNORE_CXX_SEEK) ELSEIF(MPI_LIB_mpi) SET(MPI_LIBS ${MPI_LIB_mpi}) - SET(MPI_INCLUDES ${MPI_INCLUDES} -DOMPI_IGNORE_CXX_SEEK) + SET(MPI_INCLUDES ${MPI_INCLUDES} -DOMPI_IGNORE_CXX_SEEK)# to remove + SET(MPI_FLAGS -DOMPI_IGNORE_CXX_SEEK) ELSEIF(MPI_LIB_mpich) SET(MPI_LIBS ${MPI_LIB_mpich}) - SET(MPI_INCLUDES ${MPI_INCLUDES} -DMPICH_IGNORE_CXX_SEEK) + SET(MPI_INCLUDES ${MPI_INCLUDES} -DMPICH_IGNORE_CXX_SEEK)# to remove + SET(MPI_FLAGS -DMPICH_IGNORE_CXX_SEEK) ENDIF() ELSE(MPI_LIB_FOUND) MESSAGE(STATUS "MPI lib not found, check your MPI installation.") @@ -130,7 +135,8 @@ IF(MPI_STATUS) CHECK_SYMBOL_EXISTS(MPI_Publish_name ${MPI_INCLUDE_DIR}/mpi.h MPI2_IS_OK) IF(MPI2_IS_OK) MESSAGE(STATUS "Your mpi implemtentation is compatible with mpi2 ... adding -DHAVE_MPI2") - SET(MPI_INCLUDES ${MPI_INCLUDES} -DHAVE_MPI2) + SET(MPI_INCLUDES ${MPI_INCLUDES} -DHAVE_MPI2)# to remove + SET(MPI_FLAGS ${MPI_FLAGS} -DHAVE_MPI2) ENDIF(MPI2_IS_OK) ENDIF(MPI_STATUS)