diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-08 02:21:21 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-06-08 02:21:21 -0700 |
| commit | 9abbfe88acb6f3f3497c9e8245c5754be5aa8cd4 (patch) | |
| tree | 5515916c643cba5f55ae7708207f735fd7dfe56e | |
| parent | 3ffef6223b3ec770dd531571edb3084fd2a8a3db (diff) | |
| download | vcpkg-9abbfe88acb6f3f3497c9e8245c5754be5aa8cd4.tar.gz vcpkg-9abbfe88acb6f3f3497c9e8245c5754be5aa8cd4.zip | |
[cairo] Merge changes from PR #1232
| -rw-r--r-- | ports/cairo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cairo/portfile.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL index 88325c521..0cad79902 100644 --- a/ports/cairo/CONTROL +++ b/ports/cairo/CONTROL @@ -1,4 +1,4 @@ Source: cairo -Version: 1.15.4-1 +Version: 1.15.4-2 Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB. Build-Depends: zlib, libpng, pixman, glib, freetype, fontconfig diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 9d01d4992..a15649627 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -49,7 +49,7 @@ foreach(FILE file(COPY ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cairo) endforeach() -foreach(FILE "${CURRENT_PACKAGES_DIR}/include/cairo.h") +foreach(FILE "${CURRENT_PACKAGES_DIR}/include/cairo.h" "${CURRENT_PACKAGES_DIR}/include/cairo/cairo.h") file(READ ${FILE} CAIRO_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "1" CAIRO_H "${CAIRO_H}") |