diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-07-02 11:00:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 11:00:28 -0700 |
| commit | ef91134964e8ddec77cd0db8943b72e0eaac2ef7 (patch) | |
| tree | 469e68094f10d9d41629e66146ddf285fc02d65a /ports/libiconv | |
| parent | 77617e31e31189467823fd83a76d8022f3158935 (diff) | |
| download | vcpkg-ef91134964e8ddec77cd0db8943b72e0eaac2ef7.tar.gz vcpkg-ef91134964e8ddec77cd0db8943b72e0eaac2ef7.zip | |
[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
Diffstat (limited to 'ports/libiconv')
| -rw-r--r-- | ports/libiconv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libiconv/vcpkg-cmake-wrapper.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index 4a5599053..e95414202 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 4 +Port-Version: 5 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/vcpkg-cmake-wrapper.cmake b/ports/libiconv/vcpkg-cmake-wrapper.cmake index 503cc57e2..472dd8082 100644 --- a/ports/libiconv/vcpkg-cmake-wrapper.cmake +++ b/ports/libiconv/vcpkg-cmake-wrapper.cmake @@ -2,8 +2,8 @@ include(SelectLibraryConfigurations) _find_package(${ARGS})
if(Iconv_FOUND)
- find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)
- find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH)
+ find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
+ find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib)
select_library_configurations(CHARSET)
list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES})
|