diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-04 14:05:12 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-04 14:05:12 -0800 |
| commit | e712374b2831c4d04fc3b37373ed5cf041a3713e (patch) | |
| tree | 3c1be3898e52d0e01cfc842be7ea553e8fe0bafb /ports/libgd | |
| parent | 7f80cbdeb02a126a610f3a3262eaefa9c9f9b938 (diff) | |
| parent | f6d32cc644a6f0fb9adb1bb3c3fd4905e8d61e2e (diff) | |
| download | vcpkg-e712374b2831c4d04fc3b37373ed5cf041a3713e.tar.gz vcpkg-e712374b2831c4d04fc3b37373ed5cf041a3713e.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4889
Diffstat (limited to 'ports/libgd')
| -rw-r--r-- | ports/libgd/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libgd/no-write-source-dir.patch | 14 | ||||
| -rw-r--r-- | ports/libgd/portfile.cmake | 24 |
3 files changed, 25 insertions, 15 deletions
diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL index f86afe90f..a8373f515 100644 --- a/ports/libgd/CONTROL +++ b/ports/libgd/CONTROL @@ -1,4 +1,4 @@ Source: libgd -Version: 2.2.4-3 +Version: 2.2.4-4 Description: Open source code library for the dynamic creation of images by programmers. Build-Depends: freetype, libjpeg-turbo, libpng, libwebp, tiff, fontconfig diff --git a/ports/libgd/no-write-source-dir.patch b/ports/libgd/no-write-source-dir.patch new file mode 100644 index 000000000..3017e7ee4 --- /dev/null +++ b/ports/libgd/no-write-source-dir.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b16d4a4..5126085 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -191,7 +191,8 @@ else (USE_EXT_GD)
+ CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
+ CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
+
+- CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/config.h ESCAPE_QUOTES)
++ CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h ESCAPE_QUOTES)
++ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
+
+ option(BUILD_SHARED_LIBS "Build shared libs" ON)
+ option(BUILD_STATIC_LIBS "Build static libs" OFF)
diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake index 61445641e..7e8051acc 100644 --- a/ports/libgd/portfile.cmake +++ b/ports/libgd/portfile.cmake @@ -1,19 +1,15 @@ include(vcpkg_common_functions) -set(LIBGD_VERSION 2.2.4) -set(LIBGD_HASH 02ce40c45f31cf1645ad1d3fd9b9b498323b2709d40b0681cd403c11072a1f2149f5af844a6bf9e695c29e3247013bb94c57c0225a54189d728f64caf0a938ee) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libgd-gd-${LIBGD_VERSION}) - -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/libgd/libgd/archive/gd-${LIBGD_VERSION}.tar.gz" - FILENAME "gd-${LIBGD_VERSION}.tar.gz" - SHA512 ${LIBGD_HASH}) - -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-cmake.patch") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libgd/libgd + REF gd-2.2.4 + SHA512 02ce40c45f31cf1645ad1d3fd9b9b498323b2709d40b0681cd403c11072a1f2149f5af844a6bf9e695c29e3247013bb94c57c0225a54189d728f64caf0a938ee + HEAD_REF master + PATCHES + 0001-fix-cmake.patch + no-write-source-dir.patch +) #delete CMake builtins modules file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/CMakeParseArguments.cmake) |