projects / packages / ParaView.git / blame
| Commit | Line | Data |
|---|---|---|
| 62573659 JR |
1 | diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt |
| 2 | --- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 | |
| 3 | +++ VTK/IO/NetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 | |
| 4 | @@ -10,5 +10,5 @@ set(Module_SRCS | |
| 5 | ||
| 6 | vtk_module_library(vtkIONetCDF ${Module_SRCS}) | |
| 7 | ||
| 8 | -target_link_libraries(vtkIONetCDF vtkNetCDF_cxx) | |
| 9 | +target_link_libraries(vtkIONetCDF netcdf_c++ netcdf) | |
| 10 | set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "") | |
| 11 | diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt | |
| 12 | --- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 | |
| 13 | +++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 | |
| 14 | @@ -8,4 +8,4 @@ set(Module_SRCS | |
| 15 | ||
| 16 | vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS}) | |
| 17 | ||
| 18 | -target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx) | |
| 19 | +target_link_libraries(vtkIOParallelNetCDF netcdf) | |
| 20 | diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt | |
| 21 | --- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 | |
| 22 | +++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-01-28 15:40:27.534030910 -0700 | |
| 23 | @@ -241,7 +241,7 @@ ENDIF(APPLE) | |
| 24 | ||
| 25 | ||
| 26 | VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS}) | |
| 27 | -TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) | |
| 28 | +TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) | |
| 29 | ||
| 30 | #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) | |
| 31 | ||
| 32 | diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt | |
| 33 | --- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 | |
| 34 | +++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 | |
| 35 | @@ -1,8 +1,12 @@ | |
| 36 | set(vtknetcdf_THIRD_PARTY 1) | |
| 37 | -set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) | |
| 38 | -set(vtknetcdf_INCLUDE_DIRS | |
| 39 | - ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include | |
| 40 | - ${vtknetcdf_BINARY_DIR}/vtknetcdf | |
| 41 | - ) | |
| 42 | +if(NOT VTK_USE_SYSTEM_NETCDF) | |
| 43 | + set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) | |
| 44 | + set(vtknetcdf_INCLUDE_DIRS | |
| 45 | + ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include | |
| 46 | + ${vtknetcdf_BINARY_DIR}/vtknetcdf | |
| 47 | + ) | |
| 48 | + add_subdirectory(vtknetcdf) | |
| 49 | +else(NOT VTK_USE_SYSTEM_NETCDF) | |
| 50 | + set(vtknetcdf_LIBRARIES netcdf) | |
| 51 | +endif() | |
| 52 | vtk_module_export_info() | |
| 53 | -add_subdirectory(vtknetcdf) | |
| 54 | diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h | |
| 55 | --- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2013-01-28 14:44:36.000000000 -0700 | |
| 56 | +++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-01-28 15:40:00.826176289 -0700 | |
| 57 | @@ -16,6 +16,6 @@ | |
| 58 | #define __vtk_netcdfcpp_h | |
| 59 | ||
| 60 | /* Use the netcdf library configured for VTK. */ | |
| 61 | -#include <vtknetcdf/cxx/netcdfcpp.h> | |
| 62 | +#include <netcdfcpp.h> | |
| 63 | ||
| 64 | #endif | |
| 65 | diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h | |
| 66 | --- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2013-01-28 14:44:36.000000000 -0700 | |
| 67 | +++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-01-28 15:40:00.826176289 -0700 | |
| 68 | @@ -16,6 +16,6 @@ | |
| 69 | #define __vtk_netcdf_h | |
| 70 | ||
| 71 | /* Use the netcdf library configured for VTK. */ | |
| 72 | -#include <vtknetcdf/include/netcdf.h> | |
| 73 | +#include <netcdf.h> | |
| 74 | ||
| 75 | #endif |