From 7abe99d287cc1af2fcb8b6da4420b35ab531952d Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Wed, 27 Dec 2017 13:07:21 -0500
Subject: [PATCH] exodusII: integrate with the new module system
---
ThirdParty/exodusII/CMakeLists.txt | 19 ++++++++++++-------
ThirdParty/exodusII/module.cmake | 5 -----
ThirdParty/exodusII/update.sh | 2 +-
ThirdParty/exodusII/vtk.module | 7 +++++++
4 files changed, 20 insertions(+), 13 deletions(-)
delete mode 100644 ThirdParty/exodusII/module.cmake
create mode 100644 ThirdParty/exodusII/vtk.module
diff --git a/ThirdParty/exodusII/CMakeLists.txt b/ThirdParty/exodusII/CMakeLists.txt
index a524e8693e1..9b0cf4b26fe 100644
--- a/ThirdParty/exodusII/CMakeLists.txt
+++ b/ThirdParty/exodusII/CMakeLists.txt
@@ -1,7 +1,12 @@
-set(vtkexodusII_THIRD_PARTY 1)
-set(vtkexodusII_LIBRARIES vtkexodusII)
-set(vtkexodusII_INCLUDE_DIRS
- "${CMAKE_CURRENT_BINARY_DIR}/vtkexodusII/include"
- "${CMAKE_CURRENT_SOURCE_DIR}/vtkexodusII/include")
-vtk_module_export_info()
-add_subdirectory(vtkexodusII)
+vtk_module_third_party_internal(
+ LICENSE_FILES "vtkexodusII/COPYRIGHT"
+ VERSION "7.15f"
+ STANDARD_INCLUDE_DIRS)
+
+#configure_file(
+# "${CMAKE_CURRENT_SOURCE_DIR}/vtk_exodusII.h.in"
+# "${CMAKE_CURRENT_BINARY_DIR}/vtk_exodusII.h")
+
+vtk_module_install_headers(
+# FILES "${CMAKE_CURRENT_BINARY_DIR}/vtk_exodusII.h")
+ FILES "${CMAKE_CURRENT_SOURCE_DIR}/vtk_exodusII.h")
diff --git a/ThirdParty/exodusII/module.cmake b/ThirdParty/exodusII/module.cmake
deleted file mode 100644
index 933aded2c9f..00000000000
--- a/ThirdParty/exodusII/module.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-vtk_module(vtkexodusII
- EXCLUDE_FROM_WRAPPING
- DEPENDS
- vtknetcdf
- )
\ No newline at end of file
diff --git a/ThirdParty/exodusII/update.sh b/ThirdParty/exodusII/update.sh
index 21b1098191c..0bde4bc8021 100755
--- a/ThirdParty/exodusII/update.sh
+++ b/ThirdParty/exodusII/update.sh
@@ -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-old"
+readonly tag="for/vtk-20181008-7.15f-master"
readonly paths="
packages/seacas/libraries/exodus/CMakeLists.vtk.txt
packages/seacas/libraries/exodus/cmake/exodus_config.h.in
diff --git a/ThirdParty/exodusII/vtk.module b/ThirdParty/exodusII/vtk.module
new file mode 100644
index 00000000000..27301eceb62
--- /dev/null
+++ b/ThirdParty/exodusII/vtk.module
@@ -0,0 +1,7 @@
+NAME
+ VTK::exodusII
+LIBRARY_NAME
+ vtkexodusII
+DEPENDS
+ VTK::netcdf
+THIRD_PARTY
--
GitLab