aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/libiconv/CONTROL2
-rw-r--r--ports/libiconv/unofficial-iconv-config.cmake14
2 files changed, 9 insertions, 7 deletions
diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL
index c24bac49d..48688767a 100644
--- a/ports/libiconv/CONTROL
+++ b/ports/libiconv/CONTROL
@@ -1,4 +1,4 @@
Source: libiconv
-Version: 1.15-5
+Version: 1.15-6
Homepage: https://www.gnu.org/software/libiconv/
Description: GNU Unicode text conversion
diff --git a/ports/libiconv/unofficial-iconv-config.cmake b/ports/libiconv/unofficial-iconv-config.cmake
index 7d08ff5f5..94d65d2ff 100644
--- a/ports/libiconv/unofficial-iconv-config.cmake
+++ b/ports/libiconv/unofficial-iconv-config.cmake
@@ -1,6 +1,8 @@
-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
+if (NOT TARGET unofficial::iconv::libiconv)
+ 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()
+endif()