diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-03-14 06:51:16 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-13 22:51:16 -0700 |
| commit | 0e77ca352eea87a776f14843f048ea83e1a49255 (patch) | |
| tree | 159e386fc54e35c2886b362fcd195eccdaa9fb6a | |
| parent | fc9aa1528734ba86758708738c3839c1066ea861 (diff) | |
| download | vcpkg-0e77ca352eea87a776f14843f048ea83e1a49255.tar.gz vcpkg-0e77ca352eea87a776f14843f048ea83e1a49255.zip | |
[tiff] use vcpkg wrapper for all configs, remove dead code (#5584)
* [tiff] use vcpkg wrapper for all configs, remove dead code
* [tiff] update CONTROL
| -rw-r--r-- | ports/tiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tiff/usage | 8 | ||||
| -rw-r--r-- | ports/tiff/vcpkg-cmake-wrapper.cmake | 37 | ||||
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 9 |
4 files changed, 22 insertions, 34 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() diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 733e5432f..b0fd542e4 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -205,15 +205,6 @@ macro(find_package name) else() _find_package(${ARGV}) endif() - elseif("${name}" STREQUAL "TIFF" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/tiff.h") - _find_package(${ARGV}) - find_package(LibLZMA) - if(TARGET TIFF::TIFF) - set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${LIBLZMA_LIBRARIES}) - endif() - if(TIFF_LIBRARIES) - list(APPEND TIFF_LIBRARIES ${LIBLZMA_LIBRARIES}) - endif() elseif("${name}" STREQUAL "GSL" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/gsl") _find_package(${ARGV}) if(GSL_FOUND AND TARGET GSL::gsl) |