ENH: Added names for gnuwin32 library versions.

This commit is contained in:
Brad King 2006-02-09 12:04:25 -05:00
parent b93a093dc4
commit ef88c8cbc8
4 changed files with 30 additions and 14 deletions

View File

@ -12,10 +12,15 @@ FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h
/usr/include /usr/include
) )
FIND_LIBRARY(JPEG_LIBRARY jpeg IF(BORLAND)
/usr/lib SET(JPEG_NAMES ${JPEG_NAMES} jpeg-bcc)
/usr/local/lib ENDIF(BORLAND)
) SET(JPEG_NAMES ${JPEG_NAMES} jpeg)
FIND_LIBRARY(JPEG_LIBRARY
NAMES ${JPEG_NAMES}
PATHS /usr/lib /usr/local/lib
)
IF (JPEG_LIBRARY) IF (JPEG_LIBRARY)
IF (JPEG_INCLUDE_DIR) IF (JPEG_INCLUDE_DIR)

View File

@ -18,9 +18,10 @@ IF(ZLIB_FOUND)
/usr/include /usr/include
) )
FIND_LIBRARY(PNG_LIBRARY png SET(PNG_NAMES ${PNG_NAMES} png libpng)
/usr/lib FIND_LIBRARY(PNG_LIBRARY
/usr/local/lib NAMES ${PNG_NAMES}
PATHS /usr/lib /usr/local/lib
) )
IF (PNG_LIBRARY) IF (PNG_LIBRARY)

View File

@ -12,10 +12,15 @@ FIND_PATH(TIFF_INCLUDE_DIR tiff.h
/usr/include /usr/include
) )
FIND_LIBRARY(TIFF_LIBRARY tiff IF(BORLAND)
/usr/lib SET(TIFF_NAMES ${TIFF_NAMES} libtiff-bcc)
/usr/local/lib ENDIF(BORLAND)
) SET(TIFF_NAMES ${TIFF_NAMES} tiff libtiff)
FIND_LIBRARY(TIFF_LIBRARY
NAMES ${TIFF_NAMES}
PATHS /usr/lib /usr/local/lib
)
IF(TIFF_INCLUDE_DIR) IF(TIFF_INCLUDE_DIR)
IF(TIFF_LIBRARY) IF(TIFF_LIBRARY)

View File

@ -10,9 +10,14 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
/usr/include /usr/include
) )
FIND_LIBRARY(ZLIB_LIBRARY z IF(BORLAND)
/usr/lib SET(ZLIB_NAMES ${ZLIB_NAMES} zlib-bcc)
/usr/local/lib ENDIF(BORLAND)
SET(ZLIB_NAMES ${ZLIB_NAMES} z zlib)
FIND_LIBRARY(ZLIB_LIBRARY
NAMES ${ZLIB_NAMES}
PATHS /usr/lib /usr/local/lib
) )
IF(ZLIB_INCLUDE_DIR) IF(ZLIB_INCLUDE_DIR)