From 2c947669aae03aea526df75dfaa3a812e28379c5 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 28 Aug 2020 18:01:27 -0700
Subject: [PATCH] disambiguate plugin/gdiplus #includes

Related to #1785.
---
 plugin/gdiplus/CMakeLists.txt           | 19 ++++++++++---------
 plugin/gdiplus/FileStream.cpp           |  2 +-
 plugin/gdiplus/Makefile.am              |  1 +
 plugin/gdiplus/gvdevice_gdiplus.cpp     |  4 ++--
 plugin/gdiplus/gvloadimage_gdiplus.cpp  |  2 +-
 plugin/gdiplus/gvplugin_gdiplus.cpp     |  2 +-
 plugin/gdiplus/gvplugin_gdiplus.vcxproj |  4 ++--
 plugin/gdiplus/gvrender_gdiplus.cpp     |  4 ++--
 plugin/gdiplus/gvtextlayout_gdiplus.cpp |  2 +-
 9 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/plugin/gdiplus/CMakeLists.txt b/plugin/gdiplus/CMakeLists.txt
index c2a26f690..58388d63b 100644
--- a/plugin/gdiplus/CMakeLists.txt
+++ b/plugin/gdiplus/CMakeLists.txt
@@ -1,14 +1,5 @@
 if (WIN32)
 
-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
-)
-
 add_library(gvplugin_gdiplus SHARED
     # Header files
     FileStream.h
@@ -23,6 +14,16 @@ add_library(gvplugin_gdiplus SHARED
 	gvtextlayout_gdiplus.cpp
 )
 
+target_include_directories(gvplugin_gdiplus 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
+)
+
 target_link_libraries(gvplugin_gdiplus
     gvc
     gdiplus
diff --git a/plugin/gdiplus/FileStream.cpp b/plugin/gdiplus/FileStream.cpp
index 794f87812..25b155a6b 100644
--- a/plugin/gdiplus/FileStream.cpp
+++ b/plugin/gdiplus/FileStream.cpp
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 #include "FileStream.h"
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_device.h>
 
 #include "gvplugin_gdiplus.h"
 
diff --git a/plugin/gdiplus/Makefile.am b/plugin/gdiplus/Makefile.am
index c94363d60..faf9f9f2f 100644
--- a/plugin/gdiplus/Makefile.am
+++ b/plugin/gdiplus/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/gdiplus/gvdevice_gdiplus.cpp b/plugin/gdiplus/gvdevice_gdiplus.cpp
index 942f78da0..88c4f8237 100644
--- a/plugin/gdiplus/gvdevice_gdiplus.cpp
+++ b/plugin/gdiplus/gvdevice_gdiplus.cpp
@@ -14,8 +14,8 @@
 #include "config.h"
 
 
-#include "gvplugin_device.h"
-#include "gvplugin_render.h"
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvplugin_render.h>
 #include "gvplugin_gdiplus.h"
 
 extern "C" size_t gvwrite(GVJ_t *job, const unsigned char *s, unsigned int len);
diff --git a/plugin/gdiplus/gvloadimage_gdiplus.cpp b/plugin/gdiplus/gvloadimage_gdiplus.cpp
index ffba1204f..a8f199093 100644
--- a/plugin/gdiplus/gvloadimage_gdiplus.cpp
+++ b/plugin/gdiplus/gvloadimage_gdiplus.cpp
@@ -17,7 +17,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "gvplugin_loadimage.h"
+#include <gvc/gvplugin_loadimage.h>
 #include "gvplugin_gdiplus.h"
 
 #include <windows.h>
diff --git a/plugin/gdiplus/gvplugin_gdiplus.cpp b/plugin/gdiplus/gvplugin_gdiplus.cpp
index efd319578..4d7ea8c2e 100644
--- a/plugin/gdiplus/gvplugin_gdiplus.cpp
+++ b/plugin/gdiplus/gvplugin_gdiplus.cpp
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 #include "gvplugin_gdiplus.h"
 
diff --git a/plugin/gdiplus/gvplugin_gdiplus.vcxproj b/plugin/gdiplus/gvplugin_gdiplus.vcxproj
index 3fe472853..aa73faceb 100644
--- a/plugin/gdiplus/gvplugin_gdiplus.vcxproj
+++ b/plugin/gdiplus/gvplugin_gdiplus.vcxproj
@@ -53,7 +53,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
@@ -75,7 +75,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
diff --git a/plugin/gdiplus/gvrender_gdiplus.cpp b/plugin/gdiplus/gvrender_gdiplus.cpp
index 37322762f..6282bcbb4 100644
--- a/plugin/gdiplus/gvrender_gdiplus.cpp
+++ b/plugin/gdiplus/gvrender_gdiplus.cpp
@@ -16,8 +16,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gvplugin_device.h"
-#include "gvplugin_render.h"
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvplugin_render.h>
 #include "gvplugin_gdiplus.h"
 
 #include <memory>
diff --git a/plugin/gdiplus/gvtextlayout_gdiplus.cpp b/plugin/gdiplus/gvtextlayout_gdiplus.cpp
index 39b7ce639..ba19e9088 100644
--- a/plugin/gdiplus/gvtextlayout_gdiplus.cpp
+++ b/plugin/gdiplus/gvtextlayout_gdiplus.cpp
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gvplugin_textlayout.h"
+#include <gvc/gvplugin_textlayout.h>
 #include "gvplugin_gdiplus.h"
 
 using namespace Gdiplus;
-- 
2.50.1