[tiff] Use lzma on linux

This commit is contained in:
Robert Schumacher 2018-10-22 04:16:02 -07:00
parent 2b555061ce
commit bdb1ae9907
3 changed files with 17 additions and 21 deletions

View File

@ -2,22 +2,23 @@ include(vcpkg_common_functions)
set(LIBGEOTIFF_VERSION 1.4.2) set(LIBGEOTIFF_VERSION 1.4.2)
set(LIBGEOTIFF_HASH 059c6e05eb0c47f17b102c7217a2e1636e76d622c4d1bdcf0bd89fb3505f3130bffa881e21c73cfd2ca0d6863b81322f85784658ba3539b53b63c3a8f38d1deb) set(LIBGEOTIFF_HASH 059c6e05eb0c47f17b102c7217a2e1636e76d622c4d1bdcf0bd89fb3505f3130bffa881e21c73cfd2ca0d6863b81322f85784658ba3539b53b63c3a8f38d1deb)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/1/libgeotiff-${LIBGEOTIFF_VERSION})
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz" URLS "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz"
FILENAME "libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz" FILENAME "libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz"
SHA512 ${LIBGEOTIFF_HASH}) SHA512 ${LIBGEOTIFF_HASH}
)
vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/1) vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
vcpkg_apply_patches( ARCHIVE ${ARCHIVE}
SOURCE_PATH ${SOURCE_PATH} REF ${LIBGEOTIFF_VERSION}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Updates-to-CMake-configuration-to-align-with-other-C.patch" PATCHES
"${CMAKE_CURRENT_LIST_DIR}/0002-Fix-directory-output.patch" 0001-Updates-to-CMake-configuration-to-align-with-other-C.patch
"${CMAKE_CURRENT_LIST_DIR}/0004-Fix-libxtiff-installation.patch" 0002-Fix-directory-output.patch
"${CMAKE_CURRENT_LIST_DIR}/0005-Control-shared-library-build-with-option.patch" 0004-Fix-libxtiff-installation.patch
"${CMAKE_CURRENT_LIST_DIR}/0006-Fix-utility-link-error.patch" 0005-Control-shared-library-build-with-option.patch
0006-Fix-utility-link-error.patch
) )
vcpkg_configure_cmake( vcpkg_configure_cmake(

View File

@ -1,4 +1,4 @@
Source: tiff Source: tiff
Version: 4.0.9-4 Version: 4.0.9-5
Build-Depends: zlib, libjpeg-turbo, liblzma (windows) Build-Depends: zlib, libjpeg-turbo, liblzma
Description: A library that supports the manipulation of TIFF image files Description: A library that supports the manipulation of TIFF image files

View File

@ -1,23 +1,18 @@
_find_package(${ARGS}) _find_package(${ARGS})
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
set(TIFF_EXTRA_LIBRARIES) find_package(LibLZMA)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
find_package(LibLZMA)
list(APPEND TIFF_EXTRA_LIBRARIES ${LIBLZMA_LIBRARIES})
endif()
find_package(JPEG) find_package(JPEG)
find_package(ZLIB) find_package(ZLIB)
if(TARGET TIFF::TIFF) if(TARGET TIFF::TIFF)
set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${TIFF_EXTRA_LIBRARIES} JPEG::JPEG ZLIB::ZLIB) set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${LIBLZMA_LIBRARIES} JPEG::JPEG ZLIB::ZLIB)
if(UNIX) if(UNIX)
set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES m) set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES m)
endif() endif()
endif() endif()
if(TIFF_LIBRARIES) if(TIFF_LIBRARIES)
list(APPEND TIFF_LIBRARIES ${TIFF_EXTRA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES}) list(APPEND TIFF_LIBRARIES ${LIBLZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
if(UNIX) if(UNIX)
list(APPEND TIFF_LIBRARIES m) list(APPEND TIFF_LIBRARIES m)
endif() endif()