Commit a07b8671 authored by bonnell's avatar bonnell
Browse files

Fix couple of issues with zlib on Windows

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13245 18c085ea-50e0-402c-830e-de6fd14e8384
parent 07ee38bc
......@@ -35,8 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Bonnell, Tue Apr 20 19:11:27 MST 2010
# Change lib name on windows from cgnslib to cgnsdll.
# Kathleen Bonnell, Fri Dec 10 14:36:52 PST 2010
# Set ZLIB_LIB to full path.
#
#****************************************************************************/
......@@ -46,5 +46,9 @@ INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(ZLIB lib/${VISIT_MSVC_VERSION} include zlib1)
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)
ENDIF (ZLIB_FOUND)
ENDIF (WIN32)
......@@ -189,6 +189,9 @@
# adding headers. Add VisItGenerator.cmake file for plugin development
# against an Installed VisIt on Windows.
#
# Kathleen Bonnell, Fri Dec 10 14:37:15 PST 2010
# Add VISIT_3RDPARTY_VAR(VISIT_ZLIB_DIR for windows.
#
#****************************************************************************/
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
......@@ -425,6 +428,9 @@ VISIT_3RDPARTY_VAR(VISIT_VISUS_DIR "Path containing the ViSUS library's incl
VISIT_3RDPARTY_VAR(VISIT_XDMF_DIR "Path containing the Xdmf library's include and lib" XDMF_DIR)
VISIT_3RDPARTY_VAR(VISIT_XDMF_LIBDEP "Xdmf library dependencies" XDMF_LIBDEP)
VISIT_3RDPARTY_VAR(VISIT_MDSPLUS_DIR "Path containing the MDSplus library's include and lib" MDSPLUS_DIR)
IF(WIN32)
VISIT_3RDPARTY_VAR(VISIT_ZLIB_DIR "Path containing the zlib library's include and lib" ZLIB_DIR)
ENDIF(WIN32)
#-----------------------------------------------------------------------------
# Read the version
#-----------------------------------------------------------------------------
......
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