diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-09-24 19:59:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-24 19:59:12 -0700 |
| commit | a4a8b8ebdd1b9d698c4ec92221fbca722e6e3e0e (patch) | |
| tree | b5b336cee3402b25f909a60e16b3beac314f76cc /ports | |
| parent | 726b7a6618f24fb833b597f2f5e86e1d3d0e47ea (diff) | |
| download | vcpkg-a4a8b8ebdd1b9d698c4ec92221fbca722e6e3e0e.tar.gz vcpkg-a4a8b8ebdd1b9d698c4ec92221fbca722e6e3e0e.zip | |
[libiconv] Guard imported targets in non-Windows (#8312)
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/libiconv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libiconv/unofficial-iconv-config.cmake | 14 |
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()
|