From a53d8b60f0f5bce01a5ec7c8d3650edf5536911c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Feb 20 2013 17:33:25 +0000 Subject: Revert "Fix netcdf patch" For 3.98.1 This reverts commit e18607fb632d8500e4555ee7b28dbdd1e28f19a4. --- diff --git a/vtk-6.0.0-netcdf.patch b/vtk-6.0.0-netcdf.patch index ef3bc4c..df0ef94 100644 --- a/vtk-6.0.0-netcdf.patch +++ b/vtk-6.0.0-netcdf.patch @@ -1,6 +1,6 @@ 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 +--- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 ++++ VTK/IO/NetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 @@ -10,5 +10,5 @@ set(Module_SRCS vtk_module_library(vtkIONetCDF ${Module_SRCS}) @@ -9,8 +9,8 @@ diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt +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 +--- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 ++++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 @@ -8,4 +8,4 @@ set(Module_SRCS vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS}) @@ -18,8 +18,8 @@ diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMake -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 +--- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 ++++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-01-28 15:40:27.534030910 -0700 @@ -241,7 +241,7 @@ ENDIF(APPLE) @@ -27,11 +27,11 @@ diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdPart -TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) +TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) - IF(NOT VTK_INSTALL_NO_DEVELOPMENT) - # INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h + #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) + 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 +--- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 ++++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 @@ -1,8 +1,12 @@ set(vtknetcdf_THIRD_PARTY 1) -set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) @@ -52,8 +52,8 @@ diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMake 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 +--- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2013-01-28 14:44:36.000000000 -0700 ++++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-01-28 15:40:00.826176289 -0700 @@ -16,6 +16,6 @@ #define __vtk_netcdfcpp_h @@ -63,8 +63,8 @@ diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_ #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 +--- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2013-01-28 14:44:36.000000000 -0700 ++++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-01-28 15:40:00.826176289 -0700 @@ -16,6 +16,6 @@ #define __vtk_netcdf_h