diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-05-09 20:45:23 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-05-09 11:45:23 -0700 |
| commit | 9c33de2d07e3f28ce52ea6520c9d8d23f83a1c8d (patch) | |
| tree | 9c6eb0e03cacd136e2e00d7877fb11c87205b0ec /ports/giflib | |
| parent | 223d5d82ac06cefc009c7c125771f5569d086ac5 (diff) | |
| download | vcpkg-9c33de2d07e3f28ce52ea6520c9d8d23f83a1c8d.tar.gz vcpkg-9c33de2d07e3f28ce52ea6520c9d8d23f83a1c8d.zip | |
[freeimage,freeglut,giflib,libwebp] port patches from #5169 (#6364)
* [freeimage] improve compatibility with other ports, using typedefs identical to other headers to avoid errors
* [libwebp] fixes for non-win32 systems
* [giflib] revert again #5578
* [freeglut] add missing wrapper for linux
Diffstat (limited to 'ports/giflib')
| -rw-r--r-- | ports/giflib/portfile.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake index ed68c11b8..7ca1478f7 100644 --- a/ports/giflib/portfile.cmake +++ b/ports/giflib/portfile.cmake @@ -4,18 +4,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(GIFLIB_VERSION 5.1.4) vcpkg_download_distfile(ARCHIVE - URLS "https://nchc.dl.sourceforge.net/project/giflib/giflib-${GIFLIB_VERSION}.tar.bz2" + URLS "https://nchc.dl.sourceforge.net/project/giflib/giflib-${GIFLIB_VERSION}.tar.bz2" FILENAME "giflib-${GIFLIB_VERSION}.tar.bz2" SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d ) +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + set(ADDITIONAL_PATCH "fix-compile-error.patch") +endif() + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${GIFLIB_VERSION} PATCHES msvc-guard-unistd-h.patch - fix-compile-error.patch + ${ADDITIONAL_PATCH} ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) |