diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index 6ff0584296ff77b5834d2de569024ff763b6ec2b..c403fb6d24a466ca70bb0bab684904e3e92e1eba 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 861d47196a522158392ac1be6e47f4328d0a2731..0ecb86b86fee4ac6b2e4d0c741438573f26d6a6b 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 2753c0e5b516676223f8b910bb1ebd38b99597fc..111b8d4d850c182d1feb6621be4c876f26986451 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 26631af4361877808499164cd0571c7be5950364..e648817ad0d0042e35b39ee59cdfe4168135233e 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