Commit e51e3fa5 authored by Kilian Lackhove's avatar Kilian Lackhove

change MPI_C to MPI_CXX

parent 3cf92905
......@@ -23,14 +23,10 @@ IF( NEKTAR_USE_MPI )
SET(MPI_BUILTIN OFF CACHE INTERNAL
"Determines whether MPI is built into the compiler")
IF (NOT "${HAVE_MPI_H}" OR NOT "${HAVE_MPI_SEND}")
INCLUDE (FindMPI)
FIND_PACKAGE(MPI REQUIRED)
IF (MPI_C_FOUND)
INCLUDE_DIRECTORIES( ${MPI_C_INCLUDE_PATH} )
MESSAGE(STATUS "Found MPI: ${MPI_C_LIBRARIES}")
ELSE()
MESSAGE(FATAL_ERROR "Unable to find MPI installation")
ENDIF()
INCLUDE_DIRECTORIES( ${MPI_CXX_INCLUDE_PATH} )
MESSAGE(STATUS "Found MPI: ${MPI_CXX_LIBRARIES}")
ELSE()
SET(MPI_BUILTIN ON)
MESSAGE(STATUS "Found MPI: built in")
......
......@@ -441,11 +441,11 @@ ENDIF()
IF( NEKTAR_USE_MPI )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PRIVATE ${GSMPI_LIBRARY} ${XXT_LIBRARY})
IF (NOT MPI_BUILTIN)
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${MPI_C_LIBRARIES})
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${MPI_CXX_LIBRARIES})
SET_TARGET_PROPERTIES(LibUtilities
PROPERTIES LINK_FLAGS "${THE_LINK_FLAGS} ${MPI_C_LINK_FLAGS}")
PROPERTIES LINK_FLAGS "${THE_LINK_FLAGS} ${MPI_CXX_LINK_FLAGS}")
SET_TARGET_PROPERTIES(LibUtilities
PROPERTIES COMPILE_FLAGS "${THE_COMPILE_FLAGS} ${MPI_C_COMPILE_FLAGS}")
PROPERTIES COMPILE_FLAGS "${THE_COMPILE_FLAGS} ${MPI_CXX_COMPILE_FLAGS}")
ENDIF()
ADD_DEPENDENCIES(LibUtilities gsmpi-1.2.1)
ENDIF( NEKTAR_USE_MPI )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment