From 6984ef0c2ce27e7905f47078e79117c4e02e5ea0 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 17 Apr 2018 16:16:23 -0700
Subject: [libiconv] Fix unofficial-iconv cmake targets on non-windows

---
 ports/libiconv/CONTROL                       | 2 +-
 ports/libiconv/portfile.cmake                | 2 +-
 ports/libiconv/unofficial-iconv-config.cmake | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'ports/libiconv')

diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL
index 37c1a0f0d..852156dc6 100644
--- a/ports/libiconv/CONTROL
+++ b/ports/libiconv/CONTROL
@@ -1,3 +1,3 @@
 Source: libiconv
-Version: 1.15-3
+Version: 1.15-4
 Description: GNU Unicode text conversion
diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake
index 5cc48da91..f1ee147f9 100644
--- a/ports/libiconv/portfile.cmake
+++ b/ports/libiconv/portfile.cmake
@@ -1,6 +1,6 @@
 if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/libiconv)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/unofficial-iconv)
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-iconv-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-iconv)
     return()
 endif()
diff --git a/ports/libiconv/unofficial-iconv-config.cmake b/ports/libiconv/unofficial-iconv-config.cmake
index e272ce09e..7d08ff5f5 100644
--- a/ports/libiconv/unofficial-iconv-config.cmake
+++ b/ports/libiconv/unofficial-iconv-config.cmake
@@ -1,2 +1,6 @@
-add_library(unofficial::iconv::libcharset UNKNOWN IMPORTED)
-add_library(unofficial::iconv::libiconv UNKNOWN IMPORTED)
+add_library(unofficial::iconv::libcharset INTERFACE IMPORTED)
+add_library(unofficial::iconv::libiconv INTERFACE IMPORTED)
+if(APPLE)
+    set_property(TARGET unofficial::iconv::libcharset PROPERTY INTERFACE_LINK_LIBRARIES "charset;unofficial::iconv::libiconv")
+    set_property(TARGET unofficial::iconv::libiconv PROPERTY INTERFACE_LINK_LIBRARIES "iconv")
+endif()
\ No newline at end of file
-- 
cgit v1.2.3