diff options
| author | Martin Müller <muemart@users.noreply.github.com> | 2016-10-13 23:01:17 +0200 |
|---|---|---|
| committer | Martin Müller <muemart@users.noreply.github.com> | 2016-10-13 23:01:17 +0200 |
| commit | eb2a2e375daaf4518d34452460bb4a0983818cec (patch) | |
| tree | e5f6177f5db817c850e4621c28d2a41ba4f8768e | |
| parent | 7561bbd045fefc4be6a47395820194f6c36eb807 (diff) | |
| download | vcpkg-eb2a2e375daaf4518d34452460bb4a0983818cec.tar.gz vcpkg-eb2a2e375daaf4518d34452460bb4a0983818cec.zip | |
Add ability to build static libraries and copy correct license file
| -rw-r--r-- | ports/libiconv/0001-Add-export-definitions.patch | 4 | ||||
| -rw-r--r-- | ports/libiconv/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ports/libiconv/portfile.cmake | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/ports/libiconv/0001-Add-export-definitions.patch b/ports/libiconv/0001-Add-export-definitions.patch index 3508e8f52..c59d15d9e 100644 --- a/ports/libiconv/0001-Add-export-definitions.patch +++ b/ports/libiconv/0001-Add-export-definitions.patch @@ -4,7 +4,7 @@ index 0feb068..74e5613 100644 +++ "b/include/iconv.h.build.in" @@ -27,6 +27,12 @@ #define LIBICONV_DLL_EXPORTED __attribute__((__visibility__("default"))) -+#elif defined(_WIN32) ++#elif defined(_WIN32) && @LIBICONV_DYNAMIC@ + #if defined(libiconv_EXPORTS) + #define LIBICONV_DLL_EXPORTED __declspec(dllexport) + #else @@ -21,7 +21,7 @@ index c691359..2a23585 100644 +++ "b/libcharset/include/localcharset.h.build.in" @@ -24,6 +24,12 @@ #define LIBCHARSET_DLL_EXPORTED __attribute__((__visibility__("default"))) -+#elif defined(_WIN32) ++#elif defined(_WIN32) && @LIBICONV_DYNAMIC@ + #if defined(libcharset_EXPORTS) + #define LIBCHARSET_DLL_EXPORTED __declspec(dllexport) + #else diff --git a/ports/libiconv/CMakeLists.txt b/ports/libiconv/CMakeLists.txt index 5ef46f07d..46575ca27 100644 --- a/ports/libiconv/CMakeLists.txt +++ b/ports/libiconv/CMakeLists.txt @@ -9,7 +9,6 @@ project(Libiconv) # # Options # -set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries, Always ON since this code is LGPL" FORCE) # Config file configure_file( @@ -17,6 +16,11 @@ configure_file( ${Libiconv_BINARY_DIR}/config.h ) +if(BUILD_SHARED_LIBS) + set(LIBICONV_DYNAMIC "1 /*LIBICONV_DYNAMIC*/") +else() + set(LIBICONV_DYNAMIC "0 /*LIBICONV_DYNAMIC*/") +endif() set(HAVE_WCHAR_T "1 /*HAVE_WCHAR_T*/") set(USE_MBSTATE_T "0 /*USE_MBSTATE_T*/") set(BROKEN_WCHAR_H "0 /*BROKEN_WCHAR_H*/") diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index e74d5ff21..dc1e1a3a3 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,3 +1,4 @@ +include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz" @@ -22,8 +23,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # Handle copyright -file(COPY ${CURRENT_BUILDTREES_DIR}/src/libiconv-1.14/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libiconv/COPYING ${CURRENT_PACKAGES_DIR}/share/libiconv/copyright) +file(COPY ${CURRENT_BUILDTREES_DIR}/src/libiconv-1.14/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libiconv/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/libiconv/copyright) # clean out the debug include file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
\ No newline at end of file |