Commit f98a3410 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'link-mpi-if-enabled'

a1c1aacd boxlib: complete the link
32849318 library: ensure mpi is order before if enabled
862d84b7 Merge branch 'upstream-visit' into link-mpi-if-enabled
131cad2a visit 2019-03-07 (f197ac65)
3495678a avt: update for mpi linking
39954a84 databases: link to mpi if available
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !58
parents b7eed7a3 a1c1aacd
......@@ -92,10 +92,13 @@ FUNCTION(ADD_PARALLEL_LIBRARY target)
ENDFUNCTION(ADD_PARALLEL_LIBRARY)
#set up MPI
set(VISIT_PARALLEL ${PARAVIEW_USE_MPI})
if(PARAVIEW_USE_MPI)
if (TARGET VTK::mpi)
set(VISIT_PARALLEL 1)
set(VISIT_PARALLEL_LIBS VTK::mpi)
endif(PARAVIEW_USE_MPI)
else ()
set(VISIT_PARALLEL 0)
set(VISIT_PARALLEL_LIBS VTK::mpi)
endif ()
# setup to use vtkzlib
set(ZLIB_LIB VTK::zlib)
......
......@@ -16,4 +16,6 @@ PRIVATE_DEPENDS
VTK::IOLegacy
VTK::ImagingHybrid
VTK::RenderingCore
OPTIONAL_DEPENDS
VTK::mpi
THIRD_PARTY
......@@ -114,6 +114,9 @@ if(VISIT_BUILD_READER_Boxlib3D)
if(NOT MPI_CXX_FOUND)
find_package(MPI REQUIRED)
endif()
if(NOT MPI_Fortran_FOUND)
find_package(MPI REQUIRED COMPONENTS Fortran)
endif()
endif(VISIT_BUILD_READER_Boxlib3D)
visit_include_reader_source(Boxlib3D OFF)
......@@ -183,8 +186,9 @@ if(HAVE_LIBSILO AND VISIT_BUILD_READER_Silo)
endif(HAVE_LIBSILO AND VISIT_BUILD_READER_Silo)
if(Boxlib_FOUND AND VISIT_BUILD_READER_Boxlib3D)
vtk_module_link(ParaView::IOVisItBridge PRIVATE ${Boxlib_LIBRARIES})
vtk_module_link(ParaView::IOVisItBridge PRIVATE ${Boxlib_LIBRARIES} ${Boxlib_LIBRARIES})
vtk_module_link(ParaView::IOVisItBridge PRIVATE ${GFortran_LIBRARIES})
vtk_module_link(ParaView::IOVisItBridge PRIVATE ${MPI_Fortran_LIBRARIES})
endif(Boxlib_FOUND AND VISIT_BUILD_READER_Boxlib3D)
if(HAVE_LIBMILI AND VISIT_BUILD_READER_Mili)
......
......@@ -23,3 +23,5 @@ PRIVATE_DEPENDS
VTK::hdf5
VTK::netcdf
VTK::zlib
OPTIONAL_DEPENDS
VTK::mpi
......@@ -8,7 +8,7 @@ readonly name="visit"
readonly ownership="VisIt Upstream <kwrobot@kitware.com>"
readonly subtree="Library/VisItLib"
readonly repo="https://gitlab.kitware.com/third-party/visit.git"
readonly tag="for/paraview-20190305-trunk-r30784"
readonly tag="for/paraview-20190307-trunk-r30784"
readonly paths="
COPYRIGHT
......
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