kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Brad King 2006-02-09 15:08:16 -05:00
parent 33587ce376
commit 64cb554397
4 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindJPEG.cmake
View File

@ -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

2
Modules/FindPNG.cmake
View File

@ -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

6
Modules/FindTIFF.cmake
View File

@ -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

4
Modules/FindZLIB.cmake
View File

@ -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