CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed MPI configuration to hopefully work on more systems.

Browse Source
This commit is contained in:
falgout 2012-05-09 18:13:30 +00:00
parent ca180796c9
commit 44ac0f1d52
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -735,17 +735,15 @@ endif ()
# Set MPI compile flags # Set MPI compile flags
if (NOT HYPRE_SEQUENTIAL) if (NOT HYPRE_SEQUENTIAL)
find_package (MPI) find_package (MPI)
if ((MPI_C_FOUND) AND (NOT MPI_C_COMPILER)) if ((MPI_C_FOUND) AND (NOT CMAKE_C_COMPILER STREQUAL MPI_C_COMPILER))
include_directories (${MPI_C_INCLUDE_PATH}) include_directories (${MPI_C_INCLUDE_PATH})
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_C_COMPILE_FLAGS}") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_C_COMPILE_FLAGS}")
endif ((MPI_C_FOUND) AND (NOT MPI_C_COMPILER)) endif ()
if ((MPI_CXX_FOUND) AND (NOT MPI_CXX_COMPILER)) if ((MPI_CXX_FOUND) AND (NOT CMAKE_CXX_COMPILER STREQUAL MPI_CXX_COMPILER))
include_directories (${MPI_CXX_INCLUDE_PATH}) include_directories (${MPI_CXX_INCLUDE_PATH})
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MPI_CXX_COMPILE_FLAGS}") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MPI_CXX_COMPILE_FLAGS}")
endif ((MPI_CXX_FOUND) AND (NOT MPI_CXX_COMPILER)) endif ()
endif (NOT HYPRE_SEQUENTIAL) endif (NOT HYPRE_SEQUENTIAL)
# set (HYPRE_MPI_C_INCLUDE_PATH "${MPI_C_INCLUDE_PATH}" CACHE PATH
# "MPI include path")
# Set OpenMP compile flags # Set OpenMP compile flags
if (HYPRE_USING_OPENMP) if (HYPRE_USING_OPENMP)

13
test/CMakeLists.txt
View File

@ -5,6 +5,9 @@ project (hypre-test)
set (HYPRE_INSTALL_DIR "${PROJECT_SOURCE_DIR}/../hypre" CACHE PATH set (HYPRE_INSTALL_DIR "${PROJECT_SOURCE_DIR}/../hypre" CACHE PATH
"Installation directory for HYPRE") "Installation directory for HYPRE")
# Set default compile optimization flag
set (CMAKE_BUILD_TYPE "RELEASE" CACHE INTERNAL "" FORCE)
# Include directories # Include directories
set (HYPRE_INCLUDE_DIRS "") set (HYPRE_INCLUDE_DIRS "")
list (APPEND HYPRE_INCLUDE_DIRS list (APPEND HYPRE_INCLUDE_DIRS
@ -29,6 +32,16 @@ endif (UNIX)
# CXXDEFS = -DNOFEI -DHYPRE_TIMING -DMPICH_SKIP_MPICXX # CXXDEFS = -DNOFEI -DHYPRE_TIMING -DMPICH_SKIP_MPICXX
# -lstdc++ -lm # -lstdc++ -lm
# Set MPI compile flags
if (NOT HYPRE_SEQUENTIAL)
find_package (MPI)
if ((MPI_C_FOUND) AND (NOT CMAKE_C_COMPILER STREQUAL MPI_C_COMPILER))
include_directories (${MPI_C_INCLUDE_PATH})
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_C_COMPILE_FLAGS}")
list (APPEND HYPRE_LIBS ${MPI_C_LIBRARIES})
endif ()
endif (NOT HYPRE_SEQUENTIAL)
include_directories (${HYPRE_INCLUDE_DIRS}) include_directories (${HYPRE_INCLUDE_DIRS})
link_directories (${HYPRE_LIB_DIRS}) link_directories (${HYPRE_LIB_DIRS})
add_definitions (-DHYPRE_TIMING) add_definitions (-DHYPRE_TIMING)