diff options
| author | root <root@rshg054.dnsready.net> | 2012-01-11 23:14:45 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-01-11 23:14:45 +0000 |
| commit | 3a0439ec6aea4411ac6d11c90cd8220f8f12a660 (patch) | |
| tree | adc6bcfb43847a9615413defa99b7a0946d22565 /community/paraview/12859-VisItBrige-external-tiff-support.diff | |
| parent | b8012183bbaae70ce4a714c618a967e85df9f521 (diff) | |
Wed Jan 11 23:14:45 UTC 2012
Diffstat (limited to 'community/paraview/12859-VisItBrige-external-tiff-support.diff')
| -rw-r--r-- | community/paraview/12859-VisItBrige-external-tiff-support.diff | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/community/paraview/12859-VisItBrige-external-tiff-support.diff b/community/paraview/12859-VisItBrige-external-tiff-support.diff new file mode 100644 index 000000000..1901d0146 --- /dev/null +++ b/community/paraview/12859-VisItBrige-external-tiff-support.diff @@ -0,0 +1,32 @@ +commit c69690edb180b96081f3e75d0c23bbd5abcb3d65 +Author: Robert Maynard <robert.maynard@kitware.com> +Date: Mon Jan 9 12:50:32 2012 -0500 + + Corrected build issues when using system tiff library. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b2ee9e..a83beb7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -216,6 +216,9 @@ VISIT_VTK_THIRD_PARTY_INCLUDE(NETCDF vtknetcdf/include) + #setup png + VISIT_VTK_THIRD_PARTY_INCLUDE(PNG vtkpng) + ++#setup tiff ++VISIT_VTK_THIRD_PARTY_INCLUDE(TIFF vtktiff) ++ + + #----------------------------------------------------------------------------- + # Detect packages here. We could probably write macros that we can include from +diff --git a/visit_vtk/full/CMakeLists.txt b/visit_vtk/full/CMakeLists.txt +index e83e041..532dc62 100644 +--- a/visit_vtk/full/CMakeLists.txt ++++ b/visit_vtk/full/CMakeLists.txt +@@ -115,6 +115,6 @@ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES + "${VISIT_SOURCE_DIR}/parser;${tmp_include_dirs}") + + VTK_ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES}) +-TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging vtktiff) ++TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging ${VTK_TIFF_LIBRARIES}) + + VISIT_INSTALL_TARGETS(visit_vtk) |