diff --git a/ports/exiv2/vcpkg-cmake-wrapper.cmake b/ports/exiv2/vcpkg-cmake-wrapper.cmake index 62f4ecca34..87f66dcdf5 100644 --- a/ports/exiv2/vcpkg-cmake-wrapper.cmake +++ b/ports/exiv2/vcpkg-cmake-wrapper.cmake @@ -1,14 +1,18 @@ _find_package(${ARGS}) if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - find_package(Iconv REQUIRED) + if(NOT @VCPKG_TARGET_IS_WINDOWS@) + find_package(Iconv REQUIRED) + endif() if(@EXIV2_ENABLE_NLS@) find_package(Intl REQUIRED) endif() if(TARGET exiv2lib) - set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES - Iconv::Iconv - ) + if(NOT @VCPKG_TARGET_IS_WINDOWS@) + set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES + Iconv::Iconv + ) + endif() if(@EXIV2_ENABLE_NLS@) set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${Intl_LIBRARIES}) endif() diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json index 6bbb69c997..bab5868071 100644 --- a/ports/exiv2/vcpkg.json +++ b/ports/exiv2/vcpkg.json @@ -1,12 +1,16 @@ { "name": "exiv2", "version": "0.27.5", - "port-version": 1, + "port-version": 2, "description": "Image metadata library and tools", "homepage": "https://www.exiv2.org", + "license": "GPL-2.0", "supports": "!uwp", "dependencies": [ - "libiconv", + { + "name": "libiconv", + "platform": "!windows" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index abf2c9de33..d15d81561f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2190,7 +2190,7 @@ }, "exiv2": { "baseline": "0.27.5", - "port-version": 1 + "port-version": 2 }, "expat": { "baseline": "2.4.9", diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index 383a243504..a131000d31 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99378f0a1c25d699a1b56f337dbe1a4289dd20fa", + "version": "0.27.5", + "port-version": 2 + }, { "git-tree": "5e7341b739d7b05fbb40492158b01b8fa9fcdb74", "version": "0.27.5",