From 37dbe8891ff2d96627503fa81d41ffddb7341e98 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sun, 10 Jun 2007 18:17:21 +0000 Subject: [PATCH] From Olaf Flebbe, "support current zlib and libpng library names for win32 3rdParty builds." --- CMakeModules/Find3rdPartyDependencies.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeModules/Find3rdPartyDependencies.cmake b/CMakeModules/Find3rdPartyDependencies.cmake index eb5eb5515..1a002bdb7 100644 --- a/CMakeModules/Find3rdPartyDependencies.cmake +++ b/CMakeModules/Find3rdPartyDependencies.cmake @@ -68,9 +68,9 @@ MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN) MARK_AS_ADVANCED(GLUT_glut_LIBRARY) ENDIF(GLUT_FOUND) FIND_DEPENDENCY(GIFLIB gif_lib.h "ungif;libungif" ${OSG_3RDPARTY_BIN} "D") - FIND_DEPENDENCY(ZLIB zlib.h "z;zlib" ${OSG_3RDPARTY_BIN} "D") + FIND_DEPENDENCY(ZLIB zlib.h "z;zlib;zlib1" ${OSG_3RDPARTY_BIN} "D") IF(ZLIB_FOUND) - FIND_DEPENDENCY(PNG png.h libpng ${OSG_3RDPARTY_BIN} "D") + FIND_DEPENDENCY(PNG png.h "libpng;libpng13" ${OSG_3RDPARTY_BIN} "D") IF(PNG_FOUND) #forcing subsequent FindPNG stuff to not search for other variables.... kind of a hack SET(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE FILEPATH "")