Commit 8fff40ec authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Renaming mpich2 module to mpi.

This will make it easier to just pick an approriate version of MPI for
each platform without having to worry about what implementation it is.
parent 00a224d4
......@@ -120,13 +120,14 @@ include(zlib)
include(png)
include(szip)
include(hdf5)
include(silo)
include(cgns)
include(libxml2)
include(qt)
include(python)
include(numpy)
include(boost)
include(silo)
include(manta)
if (UNIX AND NOT APPLE)
......@@ -134,7 +135,9 @@ if (UNIX AND NOT APPLE)
include(fontconfig)
include(freetype)
include(mesa)
include(mpich2)
include(mpi)
elseif (WIN32)
include(mpi)
endif()
# REMEMBER to tell VTK/ParaView to use VTK_SYSTEM_* for the
......
......@@ -7,7 +7,7 @@ endif()
add_external_project(paraview
DEPENDS_OPTIONAL
zlib png hdf5 silo cgns ffmpeg libxml2 boost python numpy
mpich2 manta qt
mpi manta qt
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON
......@@ -18,7 +18,7 @@ add_external_project(paraview
-DPARAVIEW_BUILD_QT_GUI:BOOL=${qt_ENABLED}
-DPARAVIEW_ENABLE_FFMPEG:BOOL=${ffmpeg_ENABLED}
-DPARAVIEW_ENABLE_PYTHON:BOOL=${python_ENABLED}
-DPARAVIEW_USE_MPI:BOOL=${mpich2_ENABLED}
-DPARAVIEW_USE_MPI:BOOL=${mpi_ENABLED}
-DPARAVIEW_USE_VISITBRIDGE:BOOL=ON
-DVISIT_BUILD_READER_CGNS:BOOL=${cgns_ENABLED}
-DVISIT_BUILD_READER_Silo:BOOL=${silo_ENABLED}
......
# we support using system mpi.
#dependent_option(USE_SYSTEM_MPI
# "Turn ON to use installed MPI intead of building from source." OFF
# "ENABLE_MPICH2" OFF)
#if (USE_SYSTEM_MPI)
# find_package(MPI)
# # Important variables are (where lang == C|CXX)
# # MPI_<lang>_FOUND
# # MPI_<lang>_COMPILER
# # MPI_<lang>_COMPILE_FLAGS
# # MPI_<lang>_INCLUDE_PATH
# # MPI_<lang>_LINK_FLAGS
# # MPI_<lang>_LIBRARIES
# # MPIEXEC
# # MPIEXEC_NUMPROC_FLAG
# # MPIEXEC_PREFLAGS
# # MPIEXEC_POSTFLAGS
#
# # this must be called since we're not using add_external_project().
# add_system_project(mpich2)
#else ()
add_external_project_or_use_system(mpich2
add_external_project_or_use_system(mpi
CONFIGURE_COMMAND <SOURCE_DIR>/configure
--prefix=<INSTALL_DIR>
--enable-shared
......
......@@ -62,7 +62,7 @@ foreach(executable
COMPONENT superbuild)
endforeach()
if (mpich2_ENABLED AND NOT USE_SYSTEM_mpich2)
if (mpi_ENABLED AND NOT USE_SYSTEM_mpi)
install(PROGRAMS "@install_location@/bin/mpiexec.hydra"
DESTINATION "lib/paraview-${pv_version}"
COMPONENT superbuild
......
......@@ -74,7 +74,7 @@ add_revision(manta
URL "http://paraview.org/files/v3.14/dependencies/manta-r2439.tar.gz"
URL_MD5 fbf4107fe2f6d7e8a5ae3dda71805bdc)
add_revision(mpich2
add_revision(mpi
URL "http://paraview.org/files/v3.14/dependencies/mpich2-1.4.1p1.tar.gz"
URL_MD5 b470666749bcb4a0449a072a18e2c204)
......
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