diff options
| author | Brad King <brad.king@kitware.com> | 2006-02-09 20:08:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-02-09 20:08:16 (GMT) |
| commit | 64cb55439725d26ce19439b12b2022f81e997912 (patch) | |
| tree | 9d780adeb4063fb028b0a25cd3669d63a058f268 /Modules | |
| parent | 33587ce37676c906b7deed07764e2757c6f3997f (diff) | |
| download | CMake-64cb55439725d26ce19439b12b2022f81e997912.zip CMake-64cb55439725d26ce19439b12b2022f81e997912.tar.gz CMake-64cb55439725d26ce19439b12b2022f81e997912.tar.bz2 | |
ENH: Removing platform-specific name hacks now that FIND_LIBRARY handles it.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindJPEG.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindPNG.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindTIFF.cmake | 6 | ||||
| -rw-r--r-- | Modules/FindZLIB.cmake | 4 |
4 files changed, 2 insertions, 14 deletions
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index 6ff0584..c403fb6 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -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 diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index 861d471..0ecb86b 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -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 diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake index 2753c0e..111b8d4 100644 --- a/Modules/FindTIFF.cmake +++ b/Modules/FindTIFF.cmake @@ -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 diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index 26631af..e648817 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -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 |