Skip to content
Snippets Groups Projects
Commit b6615263 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'exodus-link-hdf5' into release


1dfd6183 Merge branch 'upstream-exodusII' into exodus-link-hdf5
a98772f6 exodusII 2020-05-07 (2c24a120)
144ad43c exodusII: update to link to pthreads
ca02bcc8 exodusII: also link to hdf5 directly

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Tested-by: default avatarbadshah400 <badshah400@gmail.com>
Merge-request: !6865
parents 6220f392 1dfd6183
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@ readonly name="exodusII"
readonly ownership="Seacas Upstream <kwrobot@kitware.com>"
readonly subtree="ThirdParty/$name/vtk$name"
readonly repo="https://gitlab.kitware.com/third-party/seacas.git"
readonly tag="for/vtk-20200306-7.24f-v2019-12-18"
readonly tag="for/vtk-20200507-7.24f-v2019-12-18"
readonly paths="
packages/seacas/libraries/exodus/CMakeLists.vtk.txt
packages/seacas/libraries/exodus/cmake/exodus_config.h.in
......
......@@ -3,5 +3,6 @@ NAME
LIBRARY_NAME
vtkexodusII
DEPENDS
VTK::hdf5
VTK::netcdf
THIRD_PARTY
......@@ -297,14 +297,19 @@ set(headers
"${CMAKE_CURRENT_BINARY_DIR}/include/exodusII_cfg.h"
"${CMAKE_CURRENT_BINARY_DIR}/include/exodus_config.h")
vtk_module_find_package(PACKAGE Threads)
vtk_module_add_module(VTK::exodusII
SOURCES ${sources}
HEADERS ${headers}
HEADERS_SUBDIR "vtkexodusII/include")
target_compile_definitions(exodusII
vtk_module_definitions(VTK::exodusII
PRIVATE
exoIIc_EXPORTS)
target_include_directories(exodusII
vtk_module_include(VTK::exodusII
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
vtk_module_link(VTK::exodusII
PRIVATE
Threads::Threads)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment