Răsfoiți Sursa

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

Brad King 20 ani în urmă
părinte
comite
64cb554397
4 a modificat fișierele cu 2 adăugiri și 14 ștergeri
  1. 0 4
      Modules/FindJPEG.cmake
  2. 1 1
      Modules/FindPNG.cmake
  3. 1 5
      Modules/FindTIFF.cmake
  4. 0 4
      Modules/FindZLIB.cmake

+ 0 - 4
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

+ 1 - 1
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

+ 1 - 5
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

+ 0 - 4
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