aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2020-02-06 15:06:21 -0800
committerGitHub <noreply@github.com>2020-02-06 15:06:21 -0800
commitf79396b425ef71e0b5acfab754d50cee22443371 (patch)
tree926aae1765b5c2cbea2bdaa809ccfc066051106d
parentec41e14b871fe30f56296585a9b5a8fc27d47580 (diff)
parent3450d1bae204e5bd37ddbf89dba2ca5deb8be8a3 (diff)
downloadvcpkg-f79396b425ef71e0b5acfab754d50cee22443371.tar.gz
vcpkg-f79396b425ef71e0b5acfab754d50cee22443371.zip
Merge pull request #9800 from angelmixu/cairo-fix-export-macOS-dynamic-library
[cairo] fix export symbols on dynamic libraries for macOS
-rw-r--r--ports/cairo/CMakeLists.txt11
-rw-r--r--ports/cairo/CONTROL2
2 files changed, 10 insertions, 3 deletions
diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt
index eea64b96c..27638912b 100644
--- a/ports/cairo/CMakeLists.txt
+++ b/ports/cairo/CMakeLists.txt
@@ -208,10 +208,17 @@ set(CAIRO_GOBJECT_SOURCES
# GObject support sources do not include header with export macro
if(BUILD_SHARED_LIBS)
- set_source_files_properties(
- "../util/cairo-gobject/cairo-gobject-enums.c"
+ if(MSVC)
+ set_source_files_properties(
+ "../util/cairo-gobject/cairo-gobject-enums.c"
"../util/cairo-gobject/cairo-gobject-structs.c"
PROPERTIES COMPILE_DEFINITIONS "cairo_public=__declspec(dllexport)")
+ else()
+ set_source_files_properties(
+ "../util/cairo-gobject/cairo-gobject-enums.c"
+ "../util/cairo-gobject/cairo-gobject-structs.c"
+ PROPERTIES COMPILE_DEFINITIONS "cairo_public=__attribute__((visibility(\"default\")))")
+ endif()
endif()
add_library(cairo-gobject ${CAIRO_GOBJECT_SOURCES})
diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL
index e9d494235..ef366ca83 100644
--- a/ports/cairo/CONTROL
+++ b/ports/cairo/CONTROL
@@ -1,5 +1,5 @@
Source: cairo
-Version: 1.16.0-2
+Version: 1.16.0-3
Homepage: https://cairographics.org
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