diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2012-02-05 17:25:05 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2012-02-05 17:25:05 +0000 |
commit | 359d940358dec836dd0acfe9d9caf0b1ff0a97fe (patch) | |
tree | eeed5f77c8417a98fe5b8538d3c019d1cea00c04 /community-staging/paraview/12859-VisItBrige-external-tiff-support.diff | |
parent | cdc66cc7110e78bf1197f9effc70422114f9341b (diff) |
Sun Feb 5 17:25:01 UTC 2012
Diffstat (limited to 'community-staging/paraview/12859-VisItBrige-external-tiff-support.diff')
-rw-r--r-- | community-staging/paraview/12859-VisItBrige-external-tiff-support.diff | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/community-staging/paraview/12859-VisItBrige-external-tiff-support.diff b/community-staging/paraview/12859-VisItBrige-external-tiff-support.diff deleted file mode 100644 index 1901d0146..000000000 --- a/community-staging/paraview/12859-VisItBrige-external-tiff-support.diff +++ /dev/null @@ -1,32 +0,0 @@ -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) |