Commit 37588884 authored by bonnell's avatar bonnell

Fix image-compression problem on windows. Resolves #1552

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21562 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7b9cd410
......@@ -44,6 +44,10 @@
# Kathleen Biagas, Wed Jun 5 16:47:21 PDT 2013
# Always set VTKZLIB_LIB on windows if the vtkzlib target exists.
#
# Kathleen Biagas, Fri Aug 9 11:01:29 PDT 2013
# IF this file finds zlib, set HAVE_ZLIB_H. CHECK_INCLUDE_FILES might not
# find it, especially on windows.
#
#****************************************************************************/
# Use the ZLIB_DIR hint from the config-site .cmake file
......@@ -55,6 +59,7 @@ IF (WIN32)
IF (ZLIB_FOUND)
# use full path here, instead of just lib file.
SET(ZLIB_LIB "${ZLIB_LIBRARY_DIR}/${ZLIB_LIB}" CACHE STRING "zlib library" FORCE)
SET(HAVE_ZLIB_H true CACHE BOOL "have zlib header" FORCE)
ENDIF (ZLIB_FOUND)
IF(TARGET vtkzlib)
SET(VTKZLIB_LIB vtkzlib)
......@@ -68,6 +73,7 @@ ELSE(WIN32)
IF (ZLIB_FOUND)
# use full path here, instead of just lib file.
SET(ZLIB_LIB "${ZLIB_LIBRARY_DIR}/${ZLIB_LIB}" CACHE STRING "zlib library" FORCE)
SET(HAVE_ZLIB_H true CACHE BOOL "have zlib header" FORCE)
ENDIF (ZLIB_FOUND)
ELSE(VISIT_ZLIB_DIR)
SET(ZLIB_LIB z)
......
......@@ -233,6 +233,7 @@ ${VISIT_SOURCE_DIR}/avt/Pipeline/Sinks
${VISIT_SOURCE_DIR}/avt/Pipeline/Sources
${VISIT_SOURCE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)
# Add link directories
......
......@@ -114,7 +114,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>Multiple CMFE expressions can now be used simultaneously. This functionality was previously available, but it would occasionally lead to internal errors were one of the CMFE expressions was used in the place of others (due to name collision).</li>
<li>Time-derivative expressions containing compound variables (eg <i>mesh/ireg</i>) could not be plotted.</li>
<li>A bug that caused the clipping of double precision structured grids to return zero cells was corrected.</li>
<li></li>
<li>Windows version can now handle compressed images sent from a remote engine.</li>
</ul>
<a name="Config_changes"></a>
......
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