diff options
| author | Brad King <brad.king@kitware.com> | 2006-02-09 17:04:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-02-09 17:04:25 (GMT) |
| commit | ef88c8cbc83e8d66a3e3f6c72eb50724b9cec010 (patch) | |
| tree | 987ca245308e653be5097b3b2c15bf6623c2d174 | |
| parent | b93a093dc4e8c37b4fb2d84a4478fe40a2b34e95 (diff) | |
| download | CMake-ef88c8cbc83e8d66a3e3f6c72eb50724b9cec010.zip CMake-ef88c8cbc83e8d66a3e3f6c72eb50724b9cec010.tar.gz CMake-ef88c8cbc83e8d66a3e3f6c72eb50724b9cec010.tar.bz2 | |
ENH: Added names for gnuwin32 library versions.
| -rw-r--r-- | Modules/FindJPEG.cmake | 13 | ||||
| -rw-r--r-- | Modules/FindPNG.cmake | 7 | ||||
| -rw-r--r-- | Modules/FindTIFF.cmake | 13 | ||||
| -rw-r--r-- | Modules/FindZLIB.cmake | 11 |
4 files changed, 30 insertions, 14 deletions
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index 5bf1ae6..6ff0584 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -12,10 +12,15 @@ FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h /usr/include ) -FIND_LIBRARY(JPEG_LIBRARY jpeg -/usr/lib -/usr/local/lib -) +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 + ) IF (JPEG_LIBRARY) IF (JPEG_INCLUDE_DIR) diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index 387be32..861d471 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -18,9 +18,10 @@ IF(ZLIB_FOUND) /usr/include ) - FIND_LIBRARY(PNG_LIBRARY png - /usr/lib - /usr/local/lib + SET(PNG_NAMES ${PNG_NAMES} png libpng) + FIND_LIBRARY(PNG_LIBRARY + NAMES ${PNG_NAMES} + PATHS /usr/lib /usr/local/lib ) IF (PNG_LIBRARY) diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake index 0067756..2753c0e 100644 --- a/Modules/FindTIFF.cmake +++ b/Modules/FindTIFF.cmake @@ -12,10 +12,15 @@ FIND_PATH(TIFF_INCLUDE_DIR tiff.h /usr/include ) -FIND_LIBRARY(TIFF_LIBRARY tiff - /usr/lib - /usr/local/lib -) +IF(BORLAND) + SET(TIFF_NAMES ${TIFF_NAMES} libtiff-bcc) +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_LIBRARY) diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index b96f58d..26631af 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -10,9 +10,14 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h /usr/include ) -FIND_LIBRARY(ZLIB_LIBRARY z - /usr/lib - /usr/local/lib +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 ) IF(ZLIB_INCLUDE_DIR) |