diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt
--- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2012-12-03 08:31:35.000000000 -0700
+++ VTK/IO/NetCDF/CMakeLists.txt 2013-02-16 19:39:35.309010015 -0700
@@ -10,5 +10,5 @@ set(Module_SRCS
vtk_module_library(vtkIONetCDF ${Module_SRCS})
-target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
+target_link_libraries(vtkIONetCDF netcdf_c++ netcdf)
set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt
--- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2012-12-03 08:31:35.000000000 -0700
+++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-02-16 19:39:35.310009977 -0700
@@ -8,4 +8,4 @@ set(Module_SRCS
vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
-target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
+target_link_libraries(vtkIOParallelNetCDF netcdf)
diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
--- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2012-12-03 08:31:37.000000000 -0700
+++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-02-16 19:52:48.546376680 -0700
@@ -241,7 +241,7 @@ ENDIF(APPLE)
VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
# INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h
diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt
--- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2012-12-03 08:31:39.000000000 -0700
+++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-02-16 19:39:35.314009823 -0700
@@ -1,8 +1,12 @@
set(vtknetcdf_THIRD_PARTY 1)
-set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
-set(vtknetcdf_INCLUDE_DIRS
- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
- ${vtknetcdf_BINARY_DIR}/vtknetcdf
- )
+if(NOT VTK_USE_SYSTEM_NETCDF)
+ set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
+ set(vtknetcdf_INCLUDE_DIRS
+ ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
+ ${vtknetcdf_BINARY_DIR}/vtknetcdf
+ )
+ add_subdirectory(vtknetcdf)
+else(NOT VTK_USE_SYSTEM_NETCDF)
+ set(vtknetcdf_LIBRARIES netcdf)
+endif()
vtk_module_export_info()
-add_subdirectory(vtknetcdf)
diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
--- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2012-12-03 08:31:39.000000000 -0700
+++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-02-16 19:39:35.315009785 -0700
@@ -16,6 +16,6 @@
#define __vtk_netcdfcpp_h
/* Use the netcdf library configured for VTK. */
-#include <vtknetcdf/cxx/netcdfcpp.h>
+#include <netcdfcpp.h>
#endif
diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h
--- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2012-12-03 08:31:39.000000000 -0700
+++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-02-16 19:39:35.316009746 -0700
@@ -16,6 +16,6 @@
#define __vtk_netcdf_h
/* Use the netcdf library configured for VTK. */
-#include <vtknetcdf/include/netcdf.h>
+#include <netcdf.h>
#endif