From: Matthew Fernandez Date: Wed, 26 Aug 2020 02:59:18 +0000 (-0700) Subject: disambiguate plugin/gd #includes X-Git-Tag: 2.46.0~20^2^2~69^2~30 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5886e992f175eb61ed2f391d538755e6e8d84cc8;p=graphviz disambiguate plugin/gd #includes Related to #1242 and #1785. --- diff --git a/plugin/gd/CMakeLists.txt b/plugin/gd/CMakeLists.txt index dacce4839..0beeccd82 100644 --- a/plugin/gd/CMakeLists.txt +++ b/plugin/gd/CMakeLists.txt @@ -1,15 +1,5 @@ if (GD_FOUND) -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan - ${GD_INCLUDE_DIRS} -) - add_library(gvplugin_gd SHARED # Source files gvdevice_gd.c @@ -20,6 +10,17 @@ add_library(gvplugin_gd SHARED gvtextlayout_gd.c ) +target_include_directories(gvplugin_gd PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GD_INCLUDE_DIRS} +) + target_link_libraries(gvplugin_gd cdt cgraph diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am index bb3c47700..58202ba30 100644 --- a/plugin/gd/Makefile.am +++ b/plugin/gd/Makefile.am @@ -2,6 +2,7 @@ ## Process this file with automake to produce Makefile.in AM_CPPFLAGS = \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/common \ -I$(top_srcdir)/lib/pathplan \ -I$(top_srcdir)/lib/gvc \ diff --git a/plugin/gd/gvdevice_gd.c b/plugin/gd/gvdevice_gd.c index 5f67f1a58..4040c5474 100644 --- a/plugin/gd/gvdevice_gd.c +++ b/plugin/gd/gvdevice_gd.c @@ -13,10 +13,10 @@ #include "config.h" -#include "gvplugin_device.h" -#include "gvio.h" +#include +#include -#include "gd.h" +#include int gvdevice_gd_putBuf (gdIOCtx *context, const void *buffer, int len) { diff --git a/plugin/gd/gvloadimage_gd.c b/plugin/gd/gvloadimage_gd.c index 8953aec96..71ef28a5a 100644 --- a/plugin/gd/gvloadimage_gd.c +++ b/plugin/gd/gvloadimage_gd.c @@ -21,9 +21,9 @@ #include #endif -#include "gvplugin_loadimage.h" -#include "gvio.h" -#include "gd.h" +#include +#include +#include typedef enum { FORMAT_PNG_GD, FORMAT_GIF_GD, FORMAT_JPG_GD, FORMAT_GD_GD, FORMAT_GD2_GD, FORMAT_XPM_GD, FORMAT_WBMP_GD, FORMAT_XBM_GD, diff --git a/plugin/gd/gvplugin_gd.c b/plugin/gd/gvplugin_gd.c index 3ccb8d633..6905753b2 100644 --- a/plugin/gd/gvplugin_gd.c +++ b/plugin/gd/gvplugin_gd.c @@ -11,7 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "gvplugin.h" +#include extern gvplugin_installed_t gvrender_gd_types[]; extern gvplugin_installed_t gvrender_vrml_types[]; diff --git a/plugin/gd/gvplugin_gd.vcxproj b/plugin/gd/gvplugin_gd.vcxproj index a85628328..d42d3f5bc 100644 --- a/plugin/gd/gvplugin_gd.vcxproj +++ b/plugin/gd/gvplugin_gd.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) true EnableFastChecks MultiThreadedDebugDLL @@ -79,7 +79,7 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pixman-1.dll $(OutDir) - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) MultiThreadedDLL Level4 diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c index 7456d1003..0660e45c3 100644 --- a/plugin/gd/gvrender_gd.c +++ b/plugin/gd/gvrender_gd.c @@ -19,10 +19,10 @@ #include #include -#include "gvplugin_render.h" -#include "gvplugin_device.h" -#include "gvcint.h" /* for gvc->g for agget */ -#include "gd.h" +#include +#include +#include /* for gvc->g for agget */ +#include #ifndef INT32_MAX #define INT32_MAX (2147483647) diff --git a/plugin/gd/gvrender_gd_vrml.c b/plugin/gd/gvrender_gd_vrml.c index d350b64ff..0bde14e66 100644 --- a/plugin/gd/gvrender_gd_vrml.c +++ b/plugin/gd/gvrender_gd_vrml.c @@ -19,24 +19,24 @@ #include #include -#include "gvplugin_render.h" -#include "gvio.h" -#include "gd.h" +#include +#include +#include #ifdef HAVE_GD_PNG /* for N_GNEW() */ -#include "memory.h" +#include /* for gvcolor_t */ -#include "color.h" +#include /* for late_double() */ -#include "agxbuf.h" -#include "utils.h" +#include +#include /* for wind() */ -#include "pathutil.h" +#include extern shape_kind shapeOf(node_t *); extern pointf gvrender_ptf(GVJ_t *job, pointf p); diff --git a/plugin/gd/gvtextlayout_gd.c b/plugin/gd/gvtextlayout_gd.c index 7ead7e48e..7d8780375 100644 --- a/plugin/gd/gvtextlayout_gd.c +++ b/plugin/gd/gvtextlayout_gd.c @@ -16,9 +16,9 @@ #include #include #include -#include "gvplugin_textlayout.h" -#include "gd.h" -#include "strcasecmp.h" +#include +#include +#include #ifdef HAVE_GD_FREETYPE