diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-10-22 04:16:02 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-25 10:28:08 -0700 |
| commit | bdb1ae990747aee663a00a9cec53bf2b65bac961 (patch) | |
| tree | 64ddc4539eead3c02ef2dc81b8a5ad62d8b30928 /ports/tiff | |
| parent | 2b555061cebc08b75b7229073b030ebf6dcf83fb (diff) | |
| download | vcpkg-bdb1ae990747aee663a00a9cec53bf2b65bac961.tar.gz vcpkg-bdb1ae990747aee663a00a9cec53bf2b65bac961.zip | |
[tiff] Use lzma on linux
Diffstat (limited to 'ports/tiff')
| -rw-r--r-- | ports/tiff/CONTROL | 4 | ||||
| -rw-r--r-- | ports/tiff/vcpkg-cmake-wrapper.cmake | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 710b7a1c2..d858ff83a 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.9-4 -Build-Depends: zlib, libjpeg-turbo, liblzma (windows) +Version: 4.0.9-5 +Build-Depends: zlib, libjpeg-turbo, liblzma Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake b/ports/tiff/vcpkg-cmake-wrapper.cmake index 8edcb5e43..5ccb0e7ff 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake @@ -1,23 +1,18 @@ _find_package(${ARGS})
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
- set(TIFF_EXTRA_LIBRARIES)
- if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
- find_package(LibLZMA)
- list(APPEND TIFF_EXTRA_LIBRARIES ${LIBLZMA_LIBRARIES})
- endif()
-
+ find_package(LibLZMA)
find_package(JPEG)
find_package(ZLIB)
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)
set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES m)
endif()
endif()
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)
list(APPEND TIFF_LIBRARIES m)
endif()
|