diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/libgd | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/libgd')
| -rw-r--r-- | ports/libgd/CONTROL | 56 | ||||
| -rw-r--r-- | ports/libgd/portfile.cmake | 30 |
2 files changed, 42 insertions, 44 deletions
diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL index a909508a2..56f297798 100644 --- a/ports/libgd/CONTROL +++ b/ports/libgd/CONTROL @@ -1,28 +1,28 @@ -Source: libgd -Version: 2.2.5 -Description: Open source code library for the dynamic creation of images by programmers. -Default-Features: fontconfig, freetype, jpeg, png, tiff, webp - -Feature: fontconfig -Description: Support for fontconfig -Build-Depends: fontconfig - -Feature: freetype -Description: Support for freetype -Build-Depends: freetype - -Feature: jpeg -Description: Support for jpeg -Build-Depends: libjpeg-turbo - -Feature: png -Description: Support for png -Build-Depends: libpng - -Feature: tiff -Description: Support for tiff -Build-Depends: tiff - -Feature: webp -Description: Support for webp -Build-Depends: libwebp +Source: libgd
+Version: 2.2.5-3
+Description: Open source code library for the dynamic creation of images by programmers.
+Default-Features: fontconfig, freetype, jpeg, png, tiff, webp
+
+Feature: fontconfig
+Description: Support for fontconfig
+Build-Depends: fontconfig
+
+Feature: freetype
+Description: Support for freetype
+Build-Depends: freetype
+
+Feature: jpeg
+Description: Support for jpeg
+Build-Depends: libjpeg-turbo
+
+Feature: png
+Description: Support for png
+Build-Depends: libpng
+
+Feature: tiff
+Description: Support for tiff
+Build-Depends: tiff
+
+Feature: webp
+Description: Support for webp
+Build-Depends: libwebp
diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake index 23c1d360b..6ef2127d5 100644 --- a/ports/libgd/portfile.cmake +++ b/ports/libgd/portfile.cmake @@ -19,34 +19,34 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindPackageHandleStandardArgs.c file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindPNG.cmake) set(ENABLE_PNG OFF) -if("png" IN_LIST FEATURES) - set(ENABLE_PNG ON) +if("png" IN_LIST FEATURES) + set(ENABLE_PNG ON) endif() set(ENABLE_JPEG OFF) -if("jpeg" IN_LIST FEATURES) - set(ENABLE_JPEG ON) -endif() +if("jpeg" IN_LIST FEATURES) + set(ENABLE_JPEG ON) +endif() set(ENABLE_TIFF OFF) -if("tiff" IN_LIST FEATURES) - set(ENABLE_TIFF ON) +if("tiff" IN_LIST FEATURES) + set(ENABLE_TIFF ON) endif() set(ENABLE_FREETYPE OFF) -if("freetype" IN_LIST FEATURES) - set(ENABLE_FREETYPE ON) +if("freetype" IN_LIST FEATURES) + set(ENABLE_FREETYPE ON) endif() set(ENABLE_WEBP OFF) -if("webp" IN_LIST FEATURES) - set(ENABLE_WEBP ON) +if("webp" IN_LIST FEATURES) + set(ENABLE_WEBP ON) endif() set(ENABLE_FONTCONFIG OFF) -if("fontconfig" IN_LIST FEATURES) - set(ENABLE_FONTCONFIG ON) -endif() +if("fontconfig" IN_LIST FEATURES) + set(ENABLE_FONTCONFIG ON) +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(LIBGD_SHARED_LIBS ON) @@ -65,11 +65,9 @@ vcpkg_configure_cmake( -DENABLE_FREETYPE=${ENABLE_FREETYPE} -DENABLE_WEBP=${ENABLE_WEBP} -DENABLE_FONTCONFIG=${ENABLE_FONTCONFIG} - -DBUILD_SHARED_LIBS=${LIBGD_SHARED_LIBS} -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS} ) -vcpkg_build_cmake() vcpkg_install_cmake() vcpkg_copy_pdbs() |