From ef91134964e8ddec77cd0db8943b72e0eaac2ef7 Mon Sep 17 00:00:00 2001
From: nicole mazzuca <mazzucan@outlook.com>
Date: Thu, 2 Jul 2020 11:00:28 -0700
Subject: [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error
 in vcpkg-cmake-wrappers (#12196)

* fix drive-by error in vcpkg-cmake-wrappers

* rev port versions
---
 ports/libarchive/CONTROL                   |  2 +-
 ports/libarchive/vcpkg-cmake-wrapper.cmake | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'ports/libarchive')

diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
index 7bccf0f45..0fd8a7948 100644
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@@ -1,6 +1,6 @@
 Source: libarchive
 Version: 3.4.1
-Port-Version: 4
+Port-Version: 5
 Homepage: https://github.com/libarchive/libarchive
 Description: Library for reading and writing streaming archives
 Build-Depends: zlib
diff --git a/ports/libarchive/vcpkg-cmake-wrapper.cmake b/ports/libarchive/vcpkg-cmake-wrapper.cmake
index 7893a23a4..5e7838137 100644
--- a/ports/libarchive/vcpkg-cmake-wrapper.cmake
+++ b/ports/libarchive/vcpkg-cmake-wrapper.cmake
@@ -10,7 +10,7 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
         list(APPEND LibArchive_LIBRARIES BZip2::BZip2)
     endif()
     if(@ENABLE_LIBXML2@)
-        find_package(LibXml2 REQUIRED) 
+        find_package(LibXml2 REQUIRED)
         list(APPEND LibArchive_LIBRARIES LibXml2::LibXml2)
     endif()
     if(@ENABLE_LZ4@)
@@ -22,8 +22,8 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
         list(APPEND LibArchive_LIBRARIES LibLZMA::LibLZMA)
     endif()
     if(@ENABLE_LZO@)
-        find_library(LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)
-        find_library(LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH)
+        find_library(LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
+        find_library(LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
         if(LZO_LIBRARY_RELEASE)
             list(APPEND LibArchive_LIBRARIES optimized ${LZO_LIBRARY_RELEASE})
         endif()
@@ -32,8 +32,8 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
         endif()
     endif()
     if(@ENABLE_ZSTD@)
-        find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd zstd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)
-        find_library(ZSTD_LIBRARY_RELEASE NAMES zstd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH)
+        find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd zstd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
+        find_library(ZSTD_LIBRARY_RELEASE NAMES zstd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
         if(ZSTD_LIBRARY_RELEASE)
             list(APPEND LibArchive_LIBRARIES optimized ${ZSTD_LIBRARY_RELEASE})
         endif()
-- 
cgit v1.2.3