vtk (5.4.2-8) Rendering/CMakeLists.txt

Summary

 Rendering/CMakeLists.txt |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

    
download this patch

Patch contents

--- vtk-5.4.2.orig/Rendering/CMakeLists.txt
+++ vtk-5.4.2/Rendering/CMakeLists.txt
@@ -174,9 +174,13 @@
 
 IF(VTK_USE_GL2PS)
   SET(Kit_SRCS ${Kit_SRCS} vtkGL2PSExporter.cxx)
-  SET(Kit_GL2PS_SRCS ${VTK_SOURCE_DIR}/Utilities/gl2ps/gl2ps.c)
-  ADD_DEFINITIONS(-DGL2PS_HAVE_ZLIB)
-  ADD_DEFINITIONS(-DGL2PS_HAVE_LIBPNG)
+   
+  IF(VTK_USE_SYSTEM_GL2PS)
+  ELSE(VTK_USE_SYSTEM_GL2PS)
+    SET(Kit_GL2PS_SRCS ${VTK_SOURCE_DIR}/Utilities/vtkgl2ps/gl2ps.c)
+    ADD_DEFINITIONS(-DGL2PS_HAVE_ZLIB)
+    ADD_DEFINITIONS(-DGL2PS_HAVE_LIBPNG)
+  ENDIF(VTK_USE_SYSTEM_GL2PS)
 ENDIF(VTK_USE_GL2PS)
 
 IF(VTK_USE_CG_SHADERS)
@@ -447,7 +451,11 @@
 # Build a list of libraries to link to vtkRendering.
 
 IF(VTK_USE_GL2PS)
-  SET(KIT_LIBS ${KIT_LIBS} ${VTK_ZLIB_LIBRARIES} ${VTK_PNG_LIBRARIES})
+  IF(VTK_USE_SYSTEM_GL2PS)
+    SET(KIT_LIBS ${KIT_LIBS} ${GL2PS_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_PNG_LIBRARIES})
+  ELSE(VTK_USE_SYSTEM_GL2PS)
+    SET(KIT_LIBS ${KIT_LIBS} ${VTK_ZLIB_LIBRARIES} ${VTK_PNG_LIBRARIES})
+  ENDIF(VTK_USE_SYSTEM_GL2PS)
 ENDIF(VTK_USE_GL2PS)
 
 IF (WIN32)