diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/tiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tiff/usage | 8 | ||||
| -rw-r--r-- | ports/tiff/vcpkg-cmake-wrapper.cmake | 37 |
3 files changed, 22 insertions, 25 deletions
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 9723ea8b8..bc4310ba7 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.10-2 +Version: 4.0.10-3 Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp) Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/usage b/ports/tiff/usage index d5312603a..6b2f0f89e 100644 --- a/ports/tiff/usage +++ b/ports/tiff/usage @@ -1,4 +1,4 @@ -The package tiff is compatible with built-in CMake targets:
-
- find_package(TIFF REQUIRED)
- target_link_libraries(main PRIVATE TIFF::TIFF)
+The package tiff is compatible with built-in CMake targets: + + find_package(TIFF REQUIRED) + target_link_libraries(main PRIVATE TIFF::TIFF) diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake b/ports/tiff/vcpkg-cmake-wrapper.cmake index 5ccb0e7ff..c950b512b 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake @@ -1,20 +1,17 @@ -_find_package(${ARGS})
-
-if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
- find_package(LibLZMA)
- find_package(JPEG)
- find_package(ZLIB)
-
- if(TARGET TIFF::TIFF)
- 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 ${LIBLZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
- if(UNIX)
- list(APPEND TIFF_LIBRARIES m)
- endif()
- endif()
-endif()
+_find_package(${ARGS}) + +find_package(LibLZMA) +find_package(JPEG) +find_package(ZLIB) +if(TARGET TIFF::TIFF) + 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 ${LIBLZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES}) + if(UNIX) + list(APPEND TIFF_LIBRARIES m) + endif() +endif() |
