diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-06-12 10:32:58 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-06-12 21:14:14 -0700 |
| commit | 2a0bf9c488d5291e82a37d19d4b0f81e79678f0d (patch) | |
| tree | 53f6b64abd06271f400852aa498657fc421277cd /ports/exiv2/use-iconv.patch | |
| parent | e5253d22d264985f632aca4d13de365e6557b720 (diff) | |
| download | vcpkg-2a0bf9c488d5291e82a37d19d4b0f81e79678f0d.tar.gz vcpkg-2a0bf9c488d5291e82a37d19d4b0f81e79678f0d.zip | |
Upgrades for 2018.06.12
Diffstat (limited to 'ports/exiv2/use-iconv.patch')
| -rw-r--r-- | ports/exiv2/use-iconv.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/ports/exiv2/use-iconv.patch b/ports/exiv2/use-iconv.patch deleted file mode 100644 index 4305ec550..000000000 --- a/ports/exiv2/use-iconv.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/config/FindIconv.cmake b/config/FindIconv.cmake -index 15a0e39..53718bf 100644 ---- a/config/FindIconv.cmake -+++ b/config/FindIconv.cmake -@@ -36,12 +36,13 @@ if(NOT ICONV_INCLUDE_DIR STREQUAL "ICONV_INCLUDE_DIR-NOTFOUND") - endif() - - if(NOT ICONV_IN_GLIBC) -- find_library(ICONV_LIBRARY NAMES iconv) -+ find_library(ICONV_LIBRARY NAMES iconv libiconv) - set(ICONV_TEST ${ICONV_LIBRARY}) - else() - set(ICONV_TEST "In glibc") - endif() - -+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY}) - check_cxx_source_compiles( - "#include <iconv.h> -@@ -59,7 +60,8 @@ else(ICONV_FOUND) - set(ICONV_LIBRARIES) - endif(ICONV_FOUND) - --if(ICONV_FOUND) -+if(ICONV_FOUND) -+ set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) - check_cxx_source_compiles( - "#include <iconv.h> -@@ -69,6 +71,7 @@ if(ICONV_FOUND) - }" - ICONV_ACCEPTS_NONCONST_INPUT) - -+ set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) - check_cxx_source_compiles( - "#include <iconv.h> |