Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Rhodanos
VTK
Commits
452cfde9
Commit
452cfde9
authored
8 years ago
by
Ben Boeckel
Browse files
Options
Downloads
Patches
Plain Diff
hdf5: link against MPI if a parallel HDF5 is found
See
paraview/paraview#16814
.
parent
a8b6746b
No related branches found
Branches containing commit
Tags
v3.6.0-rc1
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ThirdParty/hdf5/module.cmake
+12
-1
12 additions, 1 deletion
ThirdParty/hdf5/module.cmake
ThirdParty/xdmf2/vtkxdmf2/CMakeLists.txt
+0
-13
0 additions, 13 deletions
ThirdParty/xdmf2/vtkxdmf2/CMakeLists.txt
with
12 additions
and
14 deletions
ThirdParty/hdf5/module.cmake
+
12
−
1
View file @
452cfde9
...
...
@@ -5,9 +5,20 @@ else()
endif
()
if
(
VTK_USE_SYSTEM_HDF5
)
set
(
vtkhdf5_LIBRARIES
${
HDF5_LIBRARIES
}
${
HDF5_HL_LIBRARIES
}
)
if
(
NOT HDF5_IS_PARALLEL
)
include
(
CheckSymbolExists
)
set
(
CMAKE_REQUIRED_INCLUDES
${
HDF5_INCLUDE_DIRS
}
)
check_symbol_exists
(
H5_HAVE_PARALLEL hdf5.h HDF5_IS_PARALLEL
)
unset
(
CMAKE_REQUIRED_INCLUDES
)
endif
()
if
(
HDF5_IS_PARALLEL
)
include
(
vtkMPI
)
list
(
APPEND vtkhdf5_LIBRARIES
${
MPI_C_LIBRARIES
}
${
MPI_CXX_LIBRARIES
}
)
endif
()
endif
()
vtk_module
(
vtkhdf5
EXCLUDE_FROM_WRAPPING
DEPENDS
vtkzlib
)
\ No newline at end of file
)
This diff is collapsed.
Click to expand it.
ThirdParty/xdmf2/vtkxdmf2/CMakeLists.txt
+
0
−
13
View file @
452cfde9
...
...
@@ -38,23 +38,10 @@ if(EXISTS "${HDF5_CONFIG}")
add_definitions
(
${
HDF5_EXTRA_FLAGS
}
)
endif
()
# Some HDF5 configurations don't properly detect parallel support so
# we need to do it manually ourselves
if
(
NOT HDF5_IS_PARALLEL
)
include
(
CheckSymbolExists
)
set
(
CMAKE_REQUIRED_INCLUDES
${
XDMF_HDF5_INCLUDE_DIRS
}
)
check_symbol_exists
(
H5_HAVE_PARALLEL hdf5.h HDF5_IS_PARALLEL
)
unset
(
CMAKE_REQUIRED_INCLUDES
)
endif
()
#optional dependencies
#MPI
option
(
XDMF_BUILD_MPI
"XDMF should use MPI"
OFF
)
mark_as_advanced
(
XDMF_BUILD_MPI
)
if
(
HDF5_IS_PARALLEL AND NOT XDMF_BUILD_MPI
)
message
(
STATUS
"Xdmf2: Enabling MPI since a parallel HDF5 is being used."
)
set
(
XDMF_BUILD_MPI ON
)
endif
()
if
(
XDMF_BUILD_MPI
)
find_package
(
MPI REQUIRED
)
include_directories
(
${
MPI_C_INCLUDE_PATH
}
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment