Sfoglia il codice sorgente

ENH: Added names for gnuwin32 library versions.

Brad King 20 anni fa
parent
commit
ef88c8cbc8
4 ha cambiato i file con 30 aggiunte e 14 eliminazioni
  1. 9 4
      Modules/FindJPEG.cmake
  2. 4 3
      Modules/FindPNG.cmake
  3. 9 4
      Modules/FindTIFF.cmake
  4. 8 3
      Modules/FindZLIB.cmake

+ 9 - 4
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)

+ 4 - 3
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)

+ 9 - 4
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)

+ 8 - 3
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)