From 5877156688272546bcb08e4585b93e4332edc219 Mon Sep 17 00:00:00 2001 From: Miguel Medalha Date: Sat, 9 Jan 2021 17:19:57 +0000 Subject: Update CMakeLists.txt. Cleanup of indentation space. Removal of leading '/' from webp include dir. --- CMakeLists.txt | 91 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebaae5e1..82ce2201 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,7 +115,6 @@ set(EXTRA_DIST Makefile.vc SConstruct autogen.sh - configure.com nmake.opt libtiff-4.pc.in) @@ -178,7 +177,7 @@ foreach(flag ${test_flags}) endforeach(flag ${test_flags}) if(MSVC) - set(CMAKE_DEBUG_POSTFIX "d") + set(CMAKE_DEBUG_POSTFIX "d") endif() option(ld-version-script "Enable linker version script" ON) @@ -462,18 +461,18 @@ find_path(DEFLATE_INCLUDE_DIR libdeflate.h) set(DEFLATE_NAMES ${DEFLATE_NAMES} deflate libdeflate libdeflatestatic) find_library(DEFLATE_LIBRARY NAMES ${DEFLATE_NAMES}) if (DEFLATE_INCLUDE_DIR AND DEFLATE_LIBRARY) - set(DEFLATE_FOUND TRUE) - set(DEFLATE_LIBRARIES ${DEFLATE_LIBRARY}) - message(STATUS "Found libdeflate: ${DEFLATE_LIBRARY}") - else() - set(DEFLATE_FOUND FALSE) + set(DEFLATE_FOUND TRUE) + set(DEFLATE_LIBRARIES ${DEFLATE_LIBRARY}) + message(STATUS "Found libdeflate: ${DEFLATE_LIBRARY}") +else() + set(DEFLATE_FOUND FALSE) endif() option(libdeflate "use libdeflate (optional for faster Deflate support, still requires zlib)" ${DEFLATE_FOUND}) if (libdeflate AND DEFLATE_FOUND AND ZIP_SUPPORT) set(LIBDEFLATE_SUPPORT TRUE) endif() if(DEFLATE_FOUND AND NOT ZIP_SUPPORT) - message(WARNING "libdeflate available but zlib is not. libdeflate cannot be used") + message(WARNING "libdeflate available but zlib is not. libdeflate cannot be used") endif() set(LIBDEFLATE_SUPPORT ${LIBDEFLATE_SUPPORT}) @@ -482,7 +481,7 @@ set(LIBDEFLATE_SUPPORT ${LIBDEFLATE_SUPPORT}) set(PIXARLOG_SUPPORT FALSE) option(pixarlog "support for Pixar log-format algorithm (requires Zlib)" ${ZLIB_SUPPORT}) if(pixarlog AND ZLIB_SUPPORT) - set(PIXARLOG_SUPPORT TRUE) + set(PIXARLOG_SUPPORT TRUE) endif() # JPEG @@ -497,7 +496,7 @@ endif() set(OJPEG_SUPPORT FALSE) option(old-jpeg "support for Old JPEG compression (read-only)" ${JPEG_SUPPORT}) if (old-jpeg AND JPEG_SUPPORT) - set(OJPEG_SUPPORT TRUE) + set(OJPEG_SUPPORT TRUE) endif() # JBIG-KIT @@ -506,14 +505,14 @@ find_path(JBIG_INCLUDE_DIR jbig.h) set(JBIG_NAMES ${JBIG_NAMES} jbig libjbig) find_library(JBIG_LIBRARY NAMES ${JBIG_NAMES}) if (JBIG_INCLUDE_DIR AND JBIG_LIBRARY) - set(JBIG_FOUND TRUE) - set(JBIG_LIBRARIES ${JBIG_LIBRARY}) - else() - set(JBIG_FOUND FALSE) + set(JBIG_FOUND TRUE) + set(JBIG_LIBRARIES ${JBIG_LIBRARY}) +else() + set(JBIG_FOUND FALSE) endif() option(jbig "use ISO JBIG compression (requires JBIT-KIT library)" ${JBIG_FOUND}) if (jbig AND JBIG_FOUND) - set(JBIG_SUPPORT TRUE) + set(JBIG_SUPPORT TRUE) endif() set(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) @@ -526,7 +525,7 @@ set(LZMA_SUPPORT FALSE) find_package(LibLZMA) option(lzma "use liblzma (required for LZMA2 compression)" ${LZMA_FOUND}) if (lzma AND LIBLZMA_FOUND) - set(LZMA_SUPPORT TRUE) + set(LZMA_SUPPORT TRUE) endif() # libzstd @@ -534,32 +533,32 @@ set(ZSTD_SUPPORT FALSE) find_path(ZSTD_INCLUDE_DIR zstd.h) find_library(ZSTD_LIBRARY NAMES zstd zstd_static) if (ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY) - check_library_exists ("${ZSTD_LIBRARY}" ZSTD_decompressStream "" ZSTD_RECENT_ENOUGH) - if (ZSTD_RECENT_ENOUGH) - set(ZSTD_FOUND TRUE) - set(ZSTD_LIBRARIES ${ZSTD_LIBRARY}) - message(STATUS "Found ZSTD library: ${ZSTD_LIBRARY}") - else() - message(WARNING "Found ZSTD library, but not recent enough. Use zstd >= 1.0") - endif() - else() - set(ZSTD_FOUND FALSE) + check_library_exists ("${ZSTD_LIBRARY}" ZSTD_decompressStream "" ZSTD_RECENT_ENOUGH) + if (ZSTD_RECENT_ENOUGH) + set(ZSTD_FOUND TRUE) + set(ZSTD_LIBRARIES ${ZSTD_LIBRARY}) + message(STATUS "Found ZSTD library: ${ZSTD_LIBRARY}") + else() + message(WARNING "Found ZSTD library, but not recent enough. Use zstd >= 1.0") + endif() +else() + set(ZSTD_FOUND FALSE) endif() option(zstd "use libzstd (required for ZSTD compression)" ${ZSTD_FOUND}) if (zstd AND ZSTD_FOUND) - set(ZSTD_SUPPORT TRUE) + set(ZSTD_SUPPORT TRUE) endif() # libwebp set(WEBP_SUPPORT FALSE) -find_path(WEBP_INCLUDE_DIR /webp/decode.h) +find_path(WEBP_INCLUDE_DIR webp/decode.h) find_library(WEBP_LIBRARY NAMES webp) if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY) - set(WEBP_LIBRARIES ${WEBP_LIBRARY}) - set(WEBP_FOUND TRUE) - message(STATUS "Found WEBP library: ${WEBP_LIBRARY}") - else() - set(WEBP_FOUND FALSE) + set(WEBP_LIBRARIES ${WEBP_LIBRARY}) + set(WEBP_FOUND TRUE) + message(STATUS "Found WEBP library: ${WEBP_LIBRARY}") +else() + set(WEBP_FOUND FALSE) endif() option(webp "use libwebp (required for WEBP compression)" ${WEBP_FOUND}) if (webp AND WEBP_FOUND) @@ -571,10 +570,10 @@ set(JPEG12_INCLUDE_DIR JPEG12_INCLUDE_DIR-NOTFOUND CACHE PATH "Include directory set(JPEG12_LIBRARY JPEG12_LIBRARY-NOTFOUND CACHE FILEPATH "12-bit libjpeg library") set(JPEG_DUAL_MODE_8_12 FALSE) if (JPEG12_INCLUDE_DIR AND JPEG12_LIBRARY) - set(JPEG12_LIBRARIES ${JPEG12_LIBRARY}) - set(JPEG12_FOUND TRUE) - else() - set(JPEG12_FOUND FALSE) + set(JPEG12_LIBRARIES ${JPEG12_LIBRARY}) + set(JPEG12_FOUND TRUE) +else() + set(JPEG12_FOUND FALSE) endif() option(jpeg12 "enable libjpeg 8/12-bit dual mode (requires separate 12-bit libjpeg build)" ${JPEG12_FOUND}) if (jpeg12 AND JPEG12_FOUND) @@ -754,20 +753,20 @@ message(STATUS "") message(STATUS " Support for external codecs:") message(STATUS " ZLIB support: Requested:${zlib} Availability:${ZLIB_FOUND} Support:${ZLIB_SUPPORT}") if(ZLIB_SUPPORT) - message(STATUS " libdeflate support: Requested:${libdeflate} Availability:${DEFLATE_FOUND} Support:${LIBDEFLATE_SUPPORT}") - else() - message(STATUS " libdeflate support: Requested:${libdeflate} Availability:${DEFLATE_FOUND} Support:${LIBDEFLATE_SUPPORT} (Depends on ZLIB Support)") + message(STATUS " libdeflate support: Requested:${libdeflate} Availability:${DEFLATE_FOUND} Support:${LIBDEFLATE_SUPPORT}") +else() + message(STATUS " libdeflate support: Requested:${libdeflate} Availability:${DEFLATE_FOUND} Support:${LIBDEFLATE_SUPPORT} (Depends on ZLIB Support)") endif() if(ZLIB_SUPPORT) - message(STATUS " Pixar log-format algorithm: Requested:${pixarlog} Availability:${ZLIB_FOUND} Support:${PIXARLOG_SUPPORT}") - else() - message(STATUS " Pixar log-format algorithm: Requested:${pixarlog} Availability:${ZLIB_FOUND} Support:${PIXARLOG_SUPPORT} (Depends on ZLIB Support)") + message(STATUS " Pixar log-format algorithm: Requested:${pixarlog} Availability:${ZLIB_FOUND} Support:${PIXARLOG_SUPPORT}") +else() + message(STATUS " Pixar log-format algorithm: Requested:${pixarlog} Availability:${ZLIB_FOUND} Support:${PIXARLOG_SUPPORT} (Depends on ZLIB Support)") endif() message(STATUS " JPEG support: Requested:${jpeg} Availability:${JPEG_FOUND} Support:${JPEG_SUPPORT}") if(JPEG_SUPPORT) - message(STATUS " Old JPEG support: Requested:${old-jpeg} Availability:${JPEG_SUPPORT} Support:${OJPEG_SUPPORT}") - else() - message(STATUS " Old JPEG support: Requested:${old-jpeg} Availability:${JPEG_SUPPORT} Support:${OJPEG_SUPPORT} (Depends on JPEG Support)") + message(STATUS " Old JPEG support: Requested:${old-jpeg} Availability:${JPEG_SUPPORT} Support:${OJPEG_SUPPORT}") +else() + message(STATUS " Old JPEG support: Requested:${old-jpeg} Availability:${JPEG_SUPPORT} Support:${OJPEG_SUPPORT} (Depends on JPEG Support)") endif() message(STATUS " JPEG 8/12 bit dual mode: Requested:${jpeg12} Availability:${JPEG12_FOUND} Support:${JPEG_DUAL_MODE_8_12}") message(STATUS " ISO JBIG support: Requested:${jbig} Availability:${JBIG_FOUND} Support:${JBIG_SUPPORT}") -- cgit v1.2.1