diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-03-26 22:07:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 22:07:09 -0700 |
| commit | d41a499be31e6e7a89e6e726c43fedbc17565ee1 (patch) | |
| tree | 554d6abadbac9e374df9acf913eb11130649ab1f | |
| parent | 23932c3944c16f5f016b9184799bd99075c6eb79 (diff) | |
| parent | 6588b55361e0e2fa533e64a656e085382c444bb2 (diff) | |
| download | vcpkg-d41a499be31e6e7a89e6e726c43fedbc17565ee1.tar.gz vcpkg-d41a499be31e6e7a89e6e726c43fedbc17565ee1.zip | |
Merge pull request #5784 from qis/dev/qis/giflib
[giflib] Changed library linkage to static.
| -rw-r--r-- | ports/giflib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ports/giflib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/giflib/portfile.cmake | 22 |
3 files changed, 15 insertions, 14 deletions
diff --git a/ports/giflib/CMakeLists.txt b/ports/giflib/CMakeLists.txt index e9b6a17c6..ae7d47447 100644 --- a/ports/giflib/CMakeLists.txt +++ b/ports/giflib/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.4) -project(giflib) +project(giflib C) set(GIFLIB_HEADERS lib/gif_lib.h @@ -18,9 +18,6 @@ set(GIFLIB_SOURCES ) add_library(gif ${GIFLIB_SOURCES}) -if (BUILD_SHARED_LIBS) - set_property(TARGET gif PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS ON) -endif () if (NOT GIFLIB_SKIP_HEADERS) install(FILES ${GIFLIB_HEADERS} DESTINATION include) diff --git a/ports/giflib/CONTROL b/ports/giflib/CONTROL index a79a8b0d4..169ddbd92 100644 --- a/ports/giflib/CONTROL +++ b/ports/giflib/CONTROL @@ -1,3 +1,3 @@ Source: giflib -Version: 5.1.4-1 +Version: 5.1.4-3 Description: A library for reading and writing gif images. diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake index ee7f96449..1747ce3c2 100644 --- a/ports/giflib/portfile.cmake +++ b/ports/giflib/portfile.cmake @@ -1,19 +1,23 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/giflib-5.1.4) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(GIFLIB_VERSION 5.1.4) vcpkg_download_distfile(ARCHIVE - URLS "http://downloads.sourceforge.net/sourceforge/giflib/giflib-5.1.4.tar.bz2" - FILENAME "giflib-5.1.4.tar.bz2" + URLS "http://downloads.sourceforge.net/sourceforge/giflib/giflib-${GIFLIB_VERSION}.tar.bz2" + FILENAME "giflib-${GIFLIB_VERSION}.tar.bz2" SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d ) -vcpkg_extract_source_archive(${ARCHIVE}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/msvc-guard-unistd-h.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${GIFLIB_VERSION} + PATCHES msvc-guard-unistd-h.patch ) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS_DEBUG |