aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-06-08 02:18:29 -0700
committerGitHub <noreply@github.com>2017-06-08 02:18:29 -0700
commitd3390a07ad397fcedeac32f320d92a5d3e85f572 (patch)
treed93d2feb9555d85bf1ca74d50bd8c59f9107a454
parenta73514fd771813e2281a5e9178ca779ee7dac82e (diff)
parent35e574de5dc3ba912bc2e7bc1c451db8c638002c (diff)
downloadvcpkg-d3390a07ad397fcedeac32f320d92a5d3e85f572.tar.gz
vcpkg-d3390a07ad397fcedeac32f320d92a5d3e85f572.zip
Merge pull request #1232 from AlexanderTaeschner/cairo_incl
[cairo] Add cairo-pdf.h and cairo-svg.h to subdir cairo in includes.
-rw-r--r--ports/cairo/CONTROL2
-rw-r--r--ports/cairo/portfile.cmake10
2 files changed, 6 insertions, 6 deletions
diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL
index 89ba03b79..88325c521 100644
--- a/ports/cairo/CONTROL
+++ b/ports/cairo/CONTROL
@@ -1,4 +1,4 @@
Source: cairo
-Version: 1.15.4
+Version: 1.15.4-1
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 57b45e91c..9471c427a 100644
--- a/ports/cairo/portfile.cmake
+++ b/ports/cairo/portfile.cmake
@@ -33,7 +33,7 @@ endif()
vcpkg_install_cmake()
# Copy the appropriate header files.
-file(COPY
+foreach(FILE
"${SOURCE_PATH}/src/cairo.h"
"${SOURCE_PATH}/src/cairo-deprecated.h"
"${SOURCE_PATH}/src/cairo-features.h"
@@ -44,10 +44,10 @@ file(COPY
"${SOURCE_PATH}/cairo-version.h"
"${SOURCE_PATH}/src/cairo-win32.h"
"${SOURCE_PATH}/util/cairo-gobject/cairo-gobject.h"
-"${SOURCE_PATH}/src/cairo-ft.h"
-DESTINATION
-${CURRENT_PACKAGES_DIR}/include
-)
+"${SOURCE_PATH}/src/cairo-ft.h")
+ file(COPY ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+ file(COPY ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cairo)
+endforeach()
# Handle copyright
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cairo)