vtknetcdfcpp: integrate with the module system

IO/NetCDF/module.cmake

@@ -14,5 +14,6 @@ vtk_module(vtkIONetCDF
   PRIVATE_DEPENDS
     vtkCommonDataModel
     vtknetcdf
+    vtknetcdfcpp
     vtksys
-  )
\ No newline at end of file
+  )

IO/NetCDF/vtkMPASReader.cxx

@@ -108,7 +108,7 @@ using namespace std;
 // this issue.
 // We cannot just check for VTK_USE_SYSTEM_NETCDF because ParaView's superbuild
 // installs a "system" netcdf with the same modifications...
-#ifdef VTK_NETCDF_USE_SIZE_T
+#if defined(VTK_NETCDFCPP_USE_SIZE_T) || defined(VTK_NETCDF_USE_SIZE_T)
 typedef size_t nc_size_t;
 #else
 typedef long nc_size_t;

IO/NetCDF/vtkMPASReader.h

@@ -80,6 +80,8 @@ version available from Los Alamos National Laboratory.
 #include "vtkIONetCDFModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
 
+#include "vtk_netcdfcpp_fwd.h" // Forward declarations for vtknetcdfcpp
+
 #include <string> // for std::string
 
 class vtkCallbackCommand;
@@ -88,9 +90,6 @@ class vtkDoubleArray;
 class vtkStdString;
 class vtkStringArray;
 
-class NcVar;
-class NcDim;
-
 class VTKIONETCDF_EXPORT vtkMPASReader : public vtkUnstructuredGridAlgorithm
 {
  public:

IO/NetCDF/vtkNetCDFCAMReader.h

@@ -31,7 +31,8 @@
 #include "vtkIONetCDFModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
 
-class NcFile;
+#include "vtk_netcdfcpp_fwd.h" // Forward declarations for vtknetcdfcpp
+
 class vtkCallbackCommand;
 class vtkDataArraySelection;
 

ThirdParty/netcdfcpp/CMakeLists.txt

+vtk_module_third_party(NetCDFCPP
+  PACKAGE NetCDF
+  COMPONENTS CXX)
+
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/vtk_netcdfcpp_fwd.h.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/vtk_netcdfcpp_fwd.h")
+if (NOT VTK_INSTALL_NO_DEVELOPMENT)
+  install(
+    FILES       "${CMAKE_CURRENT_BINARY_DIR}/vtk_netcdfcpp_fwd.h"
+    DESTINATION "${VTK_INSTALL_INCLUDE_DIR}"
+    COMPONENT   Development)
+endif ()

ThirdParty/netcdfcpp/module.cmake

+vtk_module(vtknetcdfcpp
+  DEPENDS
+    vtknetcdf
+  EXCLUDE_FROM_WRAPPING)

ThirdParty/netcdfcpp/vtk_netcdfcpp.h.in

+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtk_netcdfcxx.h
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+#ifndef vtk_netcdfcpp_h
+#define vtk_netcdfcpp_h
+
+/* Use the netcdfcpp library configured for VTK.  */
+#cmakedefine VTK_USE_SYSTEM_NETCDFCPP
+#ifdef VTK_USE_SYSTEM_NETCDFCPP
+# include <netcdfcpp.h>
+#else
+# include <vtknetcdfcpp/netcdfcpp.h>
+#endif
+
+#endif

ThirdParty/netcdfcpp/vtk_netcdfcpp_fwd.h.in

+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtk_netcdfcxx_fwd.h
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+#ifndef vtk_netcdfcpp_fwd_h
+#define vtk_netcdfcpp_fwd_h
+
+/* Use the netcdfcpp library configured for VTK.  */
+#cmakedefine VTK_USE_SYSTEM_NETCDFCPP
+#ifndef VTK_USE_SYSTEM_NETCDFCPP
+# include <vtknetcdfcpp/vtk_netcdfcpp_mangle.h>
+#endif
+
+class NcDim;
+class NcFile;
+class NcVar;
+
+#endif