|
 |
27b8c85 |
diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt
|
|
|
27b8c85 |
--- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700
|
|
|
27b8c85 |
+++ VTK/IO/NetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700
|
|
|
3959c95 |
@@ -10,5 +10,5 @@ set(Module_SRCS
|
|
|
3959c95 |
|
|
|
3959c95 |
vtk_module_library(vtkIONetCDF ${Module_SRCS})
|
|
|
3959c95 |
|
|
|
3959c95 |
-target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
|
|
|
3959c95 |
+target_link_libraries(vtkIONetCDF netcdf_c++ netcdf)
|
|
|
3959c95 |
set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
|
|
|
27b8c85 |
diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt
|
|
|
27b8c85 |
--- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700
|
|
|
27b8c85 |
+++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700
|
|
|
3959c95 |
@@ -8,4 +8,4 @@ set(Module_SRCS
|
|
|
3959c95 |
|
|
|
3959c95 |
vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
|
|
|
3959c95 |
|
|
|
3959c95 |
-target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
|
|
|
3959c95 |
+target_link_libraries(vtkIOParallelNetCDF netcdf)
|
|
|
27b8c85 |
diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
|
|
|
27b8c85 |
--- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700
|
|
|
27b8c85 |
+++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-01-28 15:40:27.534030910 -0700
|
|
|
3959c95 |
@@ -241,7 +241,7 @@ ENDIF(APPLE)
|
|
|
3959c95 |
|
|
|
3959c95 |
|
|
|
3959c95 |
VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
|
|
|
3959c95 |
-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
|
|
|
3959c95 |
+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
|
|
|
3959c95 |
|
|
|
27b8c85 |
#INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
|
|
|
27b8c85 |
|
|
|
27b8c85 |
diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt
|
|
|
27b8c85 |
--- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700
|
|
|
27b8c85 |
+++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700
|
|
|
3959c95 |
@@ -1,8 +1,12 @@
|
|
|
3959c95 |
set(vtknetcdf_THIRD_PARTY 1)
|
|
|
3959c95 |
-set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
|
|
|
3959c95 |
-set(vtknetcdf_INCLUDE_DIRS
|
|
|
3959c95 |
- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
|
|
|
3959c95 |
- ${vtknetcdf_BINARY_DIR}/vtknetcdf
|
|
|
3959c95 |
- )
|
|
|
3959c95 |
+if(NOT VTK_USE_SYSTEM_NETCDF)
|
|
|
3959c95 |
+ set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
|
|
|
3959c95 |
+ set(vtknetcdf_INCLUDE_DIRS
|
|
|
3959c95 |
+ ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
|
|
|
3959c95 |
+ ${vtknetcdf_BINARY_DIR}/vtknetcdf
|
|
|
3959c95 |
+ )
|
|
|
3959c95 |
+ add_subdirectory(vtknetcdf)
|
|
|
3959c95 |
+else(NOT VTK_USE_SYSTEM_NETCDF)
|
|
|
3959c95 |
+ set(vtknetcdf_LIBRARIES netcdf)
|
|
|
3959c95 |
+endif()
|
|
|
3959c95 |
vtk_module_export_info()
|
|
|
3959c95 |
-add_subdirectory(vtknetcdf)
|
|
|
27b8c85 |
diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
|
|
|
27b8c85 |
--- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2013-01-28 14:44:36.000000000 -0700
|
|
|
27b8c85 |
+++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-01-28 15:40:00.826176289 -0700
|
|
|
3959c95 |
@@ -16,6 +16,6 @@
|
|
|
3959c95 |
#define __vtk_netcdfcpp_h
|
|
|
3959c95 |
|
|
|
3959c95 |
/* Use the netcdf library configured for VTK. */
|
|
|
3959c95 |
-#include <vtknetcdf/cxx/netcdfcpp.h>
|
|
|
3959c95 |
+#include <netcdfcpp.h>
|
|
|
3959c95 |
|
|
|
3959c95 |
#endif
|
|
|
27b8c85 |
diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h
|
|
|
27b8c85 |
--- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2013-01-28 14:44:36.000000000 -0700
|
|
|
27b8c85 |
+++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-01-28 15:40:00.826176289 -0700
|
|
|
3959c95 |
@@ -16,6 +16,6 @@
|
|
|
3959c95 |
#define __vtk_netcdf_h
|
|
|
3959c95 |
|
|
|
3959c95 |
/* Use the netcdf library configured for VTK. */
|
|
|
3959c95 |
-#include <vtknetcdf/include/netcdf.h>
|
|
|
3959c95 |
+#include <netcdf.h>
|
|
|
3959c95 |
|
|
|
3959c95 |
#endif
|