From 64cb55439725d26ce19439b12b2022f81e997912 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 9 Feb 2006 15:08:16 -0500
Subject: [PATCH] ENH: Removing platform-specific name hacks now that
FIND_LIBRARY handles it.
---
Modules/FindJPEG.cmake | 4 ----
Modules/FindPNG.cmake | 2 +-
Modules/FindTIFF.cmake | 6 +-----
Modules/FindZLIB.cmake | 4 ----
4 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index 6ff0584296..c403fb6d24 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 861d47196a..0ecb86b86f 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 2753c0e5b5..111b8d4d85 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 26631af436..e648817ad0 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
--
GitLab