Commit bb081ef4 authored by hkrishna's avatar hkrishna

updating vtkpng vtkjpeg vtktiff vtkfreetype,etc.. to use VTK_PNG_LIBRARIES...

updating vtkpng vtkjpeg vtktiff vtkfreetype,etc.. to use VTK_PNG_LIBRARIES VTK_JPEG_LIBRARIES, etc.. cmake variables. This is because External VTK builds may use libraries that don't depend on vtk versions

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@19396 18c085ea-50e0-402c-830e-de6fd14e8384
parent b17f8764
......@@ -172,10 +172,10 @@ TARGET_LINK_LIBRARIES(engine_ser_exe
${engine_ser_exe_EPlot_ser}
engine_ser
visit_verdict
vtkjpeg
vtkpng
vtkzlib
vtkfreetype
${VTK_JPEG_LIBRARIES}
${VTK_PNG_LIBRARIES}
${VTK_ZLIB_LIBRARIES}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
${ALL_THIRDPARTY_IO_LIB}
${TCMALLOC_LIB}
......@@ -252,10 +252,11 @@ IF(VISIT_PARALLEL)
${engine_par_exe_EPlot_par}
engine_par
visit_verdict
vtkjpeg
vtkpng
vtkzlib
vtkfreetype
${VTK_JPEG_LIBRARIES}
${VTK_PNG_LIBRARIES}
${VTK_ZLIB_LIBRARIES}
${Z_LIB}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
${ALL_THIRDPARTY_IO_LIB}
${TCMALLOC_LIB}
......
......@@ -118,10 +118,10 @@ TARGET_LINK_LIBRARIES(mdserver
visit_verdict
vtkCommon
vtkIO
vtktiff
vtkzlib
vtkpng
vtkjpeg
${VTK_TIFF_LIBRARIES}
${VTK_ZLIB_LIBRARIES}
${VTK_PNG_LIBRARIES}
${VTK_JPEG_LIBRARIES}
${ZLIB_LIB}
${CMAKE_THREAD_LIBS}
${DL_LIB}
......
......@@ -56,7 +56,7 @@ ${VTK_INCLUDE_DIRS}
LINK_DIRECTORIES(${VTK_LIBRARY_DIRS})
ADD_LIBRARY(bow ${BOW_SOURCES})
TARGET_LINK_LIBRARIES(bow vtkzlib)
TARGET_LINK_LIBRARIES(bow ${VTK_ZLIB_LIBRARIES})
VISIT_INSTALL_TARGETS(bow)
SET_TARGET_PROPERTIES(bow PROPERTIES FOLDER thirdparty_builtin/bow)
......@@ -104,10 +104,10 @@ ${ICET_LIBRARY_DIR}
)
SET(VTK_EXTRA_LIBS
vtkjpeg
vtkpng
vtkzlib
vtkfreetype
${VTK_JPEG_LIBRARIES}
${VTK_PNG_LIBRARIES}
${VTK_ZLIB_LIBRARIES}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
)
......
......@@ -69,11 +69,11 @@ ${VTK_LIBRARY_DIRS}
)
SET(VTK_EXTRA_LIBS
vtktiff
vtkjpeg
vtkpng
vtkzlib
vtkfreetype
${VTK_TIFF_LIBRARIES}
${VTK_JPEG_LIBRARIES}
${VTK_PNG_LIBRARIES}
${VTK_ZLIB_LIBRARIES}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
)
......
......@@ -104,11 +104,11 @@ ${QT_INCLUDES}
)
SET(VTK_EXTRA_LIBS
vtktiff
vtkjpeg
vtkpng
vtkzlib
vtkfreetype
${VTK_TIFF_LIBRARIES}
${VTK_JPEG_LIBRARIES}
${VTK_PNG_LIBRARIES}
${VTK_ZLIB_LIBRARIES}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
)
......
......@@ -75,11 +75,11 @@ ${ALL_THIRDPARTY_IO_LIBRARY_DIR}
)
SET(VTK_EXTRA_LIBS
vtktiff
vtkjpeg
vtkpng
vtkzlib
vtkfreetype
${VTK_TIFF_LIBRARIES}
${VTK_JPEG_LIBRARIES}
${VTK_PNG_LIBRARIES}
${VTK_ZLIB_LIBRARIES}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
)
......
......@@ -122,6 +122,6 @@ ENDIF(HAVE_BILIB)
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment