aboutsummaryrefslogtreecommitdiff
path: root/ports/cairo
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2018-12-18 15:22:05 -0800
committerPhil Christensen <philc@microsoft.com>2018-12-18 15:22:05 -0800
commit3cd8d3e85696fba0c0962d07c9f3486c62dcafe8 (patch)
tree26103826af2b25268fd4cc2f86b32718e77f0760 /ports/cairo
parentbc79cf9a7c39067fcbd7765ec8129b232cb35da4 (diff)
parentd2b0798854c16d8644e3ba2f69ffd3baa448f4ec (diff)
downloadvcpkg-3cd8d3e85696fba0c0962d07c9f3486c62dcafe8.tar.gz
vcpkg-3cd8d3e85696fba0c0962d07c9f3486c62dcafe8.zip
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4951
Diffstat (limited to 'ports/cairo')
-rw-r--r--ports/cairo/CMakeLists.txt3
-rw-r--r--ports/cairo/CONTROL2
2 files changed, 3 insertions, 2 deletions
diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt
index 137dba7f3..9fc476539 100644
--- a/ports/cairo/CMakeLists.txt
+++ b/ports/cairo/CMakeLists.txt
@@ -160,6 +160,7 @@ endif()
set(CMAKE_DEBUG_POSTFIX "d")
+find_package(Threads REQUIRED)
find_package(ZLIB REQUIRED)
find_package(PNG REQUIRED)
find_package(Freetype REQUIRED)
@@ -176,7 +177,7 @@ add_definitions(
-DHAVE_FT_GET_X11_FONT_FORMAT=1)
# additional features for macOS
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+if((CMAKE_SYSTEM_NAME STREQUAL "Darwin") OR (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
add_definitions(
-DHAVE_INTTYPES_H=1
-DHAVE_STDINT_H=1
diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL
index 2f182e84b..365fe38e7 100644
--- a/ports/cairo/CONTROL
+++ b/ports/cairo/CONTROL
@@ -1,4 +1,4 @@
Source: cairo
-Version: 1.15.8-3
+Version: 1.15.8-4
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