Skip to content
Snippets Groups Projects
Commit 64cb5543 authored by Brad King's avatar Brad King
Browse files

ENH: Removing platform-specific name hacks now that FIND_LIBRARY handles it.

parent 33587ce3
No related branches found
No related tags found
No related merge requests found
......@@ -12,11 +12,7 @@ FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h
/usr/include
)
IF(BORLAND)
SET(JPEG_NAMES ${JPEG_NAMES} jpeg-bcc)
ENDIF(BORLAND)
SET(JPEG_NAMES ${JPEG_NAMES} jpeg)
FIND_LIBRARY(JPEG_LIBRARY
NAMES ${JPEG_NAMES}
PATHS /usr/lib /usr/local/lib
......
......@@ -18,7 +18,7 @@ IF(ZLIB_FOUND)
/usr/include
)
SET(PNG_NAMES ${PNG_NAMES} png libpng)
SET(PNG_NAMES ${PNG_NAMES} png)
FIND_LIBRARY(PNG_LIBRARY
NAMES ${PNG_NAMES}
PATHS /usr/lib /usr/local/lib
......
......@@ -12,11 +12,7 @@ FIND_PATH(TIFF_INCLUDE_DIR tiff.h
/usr/include
)
IF(BORLAND)
SET(TIFF_NAMES ${TIFF_NAMES} libtiff-bcc)
ENDIF(BORLAND)
SET(TIFF_NAMES ${TIFF_NAMES} tiff libtiff)
SET(TIFF_NAMES ${TIFF_NAMES} tiff)
FIND_LIBRARY(TIFF_LIBRARY
NAMES ${TIFF_NAMES}
PATHS /usr/lib /usr/local/lib
......
......@@ -10,11 +10,7 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
/usr/include
)
IF(BORLAND)
SET(ZLIB_NAMES ${ZLIB_NAMES} zlib-bcc)
ENDIF(BORLAND)
SET(ZLIB_NAMES ${ZLIB_NAMES} z zlib)
FIND_LIBRARY(ZLIB_LIBRARY
NAMES ${ZLIB_NAMES}
PATHS /usr/lib /usr/local/lib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment