aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-02-23 23:55:32 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-02-23 23:55:32 -0800
commitc55ccbf146f6aeaba158f58614578906ae3f01ab (patch)
tree065623ce43c9f4f345609c34e9085bf239ae7f15
parent451c6a80264f55c0cb2166f65fd44e5092debb84 (diff)
downloadvcpkg-c55ccbf146f6aeaba158f58614578906ae3f01ab.tar.gz
vcpkg-c55ccbf146f6aeaba158f58614578906ae3f01ab.zip
[exiv2] Hotfix previous fix -- apply patches before configuring
-rw-r--r--ports/exiv2/CONTROL2
-rw-r--r--ports/exiv2/portfile.cmake10
2 files changed, 6 insertions, 6 deletions
diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL
index 2a0c9837f..087cd84e4 100644
--- a/ports/exiv2/CONTROL
+++ b/ports/exiv2/CONTROL
@@ -1,4 +1,4 @@
Source: exiv2
-Version: 8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99-2
+Version: 8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99-3
Build-Depends: zlib, expat, libiconv
Description: Image metadata library and tools http://www.exiv2.org
diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake
index c6fc7bbac..a4f9e1b00 100644
--- a/ports/exiv2/portfile.cmake
+++ b/ports/exiv2/portfile.cmake
@@ -8,16 +8,16 @@ vcpkg_from_github(
HEAD_REF master
)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
-)
-
vcpkg_apply_patches(
SOURCE_PATH "${SOURCE_PATH}"
PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-iconv.patch"
)
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+)
+
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH "share/exiv2/cmake")