mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 12:37:55 +08:00
7ceccee7f8
* [graphviz] Cleanup * Refresh patches * Versions * Disable #pragma comment lib * DLLs without exports * [librsvg] Modernize * Revise vendored librsvg build * [libcroco] Revise vendored build * [librsvg] Revise vendored build, cont. * [libcroco] Fix version * [librsvg] Fix pc file * [librsvg] Fix config polyfill * Mingw fixes, no abs paths * No abs paths
70 lines
2.0 KiB
Diff
70 lines
2.0 KiB
Diff
diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt
|
|
index 3b068b0..4e3758f 100644
|
|
--- a/cmd/dot/CMakeLists.txt
|
|
+++ b/cmd/dot/CMakeLists.txt
|
|
@@ -58,6 +58,7 @@ target_link_libraries(dot_builtins PRIVATE
|
|
gvplugin_core
|
|
gvplugin_dot_layout
|
|
gvplugin_neato_layout
|
|
+ ${GTS_LINK_LIBRARIES}
|
|
pathplan
|
|
xdot
|
|
)
|
|
diff --git a/cmd/gvmap/CMakeLists.txt b/cmd/gvmap/CMakeLists.txt
|
|
index d5b0d42..9263b19 100644
|
|
--- a/cmd/gvmap/CMakeLists.txt
|
|
+++ b/cmd/gvmap/CMakeLists.txt
|
|
@@ -26,6 +26,7 @@ if(with_sfdp)
|
|
gvc
|
|
ingraphs
|
|
neatogen
|
|
+ ${GTS_LINK_LIBRARIES}
|
|
rbtree
|
|
sfdpgen
|
|
sparse
|
|
@@ -92,6 +93,7 @@ if(with_sfdp)
|
|
gvc
|
|
ingraphs
|
|
neatogen
|
|
+ ${GTS_LINK_LIBRARIES}
|
|
rbtree
|
|
sfdpgen
|
|
sparse
|
|
diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt
|
|
index 6928bf6..5a4c308 100644
|
|
--- a/cmd/tools/CMakeLists.txt
|
|
+++ b/cmd/tools/CMakeLists.txt
|
|
@@ -320,6 +320,7 @@ target_link_libraries(gvpack
|
|
cgraph
|
|
gvc
|
|
gvplugin_neato_layout
|
|
+ ${GTS_LINK_LIBRARIES}
|
|
ingraphs
|
|
)
|
|
|
|
diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c
|
|
index 0085107..8879003 100644
|
|
--- a/plugin/gd/gvrender_gd.c
|
|
+++ b/plugin/gd/gvrender_gd.c
|
|
@@ -240,7 +240,7 @@ static void gdgen_end_page(GVJ_t * job)
|
|
#else
|
|
#define GD_IMPORT
|
|
#endif
|
|
-GD_IMPORT extern gdFontPtr gdFontTiny, gdFontSmall, gdFontMediumBold, gdFontLarge, gdFontGiant;
|
|
+BGD_EXPORT_DATA_PROT extern gdFontPtr gdFontTiny, gdFontSmall, gdFontMediumBold, gdFontLarge, gdFontGiant;
|
|
|
|
void gdgen_text(gdImagePtr im, pointf spf, pointf epf, int fontcolor, double fontsize, int fontdpi, double fontangle, char *fontname, char *str)
|
|
{
|
|
diff --git a/plugin/pango/CMakeLists.txt b/plugin/pango/CMakeLists.txt
|
|
index aca7eec..901f118 100644
|
|
--- a/plugin/pango/CMakeLists.txt
|
|
+++ b/plugin/pango/CMakeLists.txt
|
|
@@ -58,6 +58,7 @@ if(CAIRO_FOUND AND PANGOCAIRO_FOUND)
|
|
set_target_properties(gvplugin_pango PROPERTIES
|
|
VERSION ${GRAPHVIZ_PLUGIN_VERSION}.0.0
|
|
SOVERSION ${GRAPHVIZ_PLUGIN_VERSION}
|
|
+ LINKER_LANGUAGE CXX # for cairo
|
|
)
|
|
|
|
if(MINGW)
|