From 92abc81bbab25e7ad82b6447c1a6efb4c71e7f92 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 22 Aug 2020 17:35:42 -0700
Subject: [PATCH] disambiguate lib/xdot/*.c #includes

Related to #1785.
---
 lib/xdot/CMakeLists.txt | 7 +++++--
 lib/xdot/Makefile.am    | 2 ++
 lib/xdot/xdot.c         | 2 +-
 lib/xdot/xdot.vcxproj   | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/xdot/CMakeLists.txt b/lib/xdot/CMakeLists.txt
index 530cf4bf7..afd07939f 100644
--- a/lib/xdot/CMakeLists.txt
+++ b/lib/xdot/CMakeLists.txt
@@ -1,7 +1,5 @@
 add_definitions(-DEXPORT_XDOT)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
 add_library(xdot SHARED
     # Header files
     xdot.h
@@ -10,6 +8,11 @@ add_library(xdot SHARED
     xdot.c
 )
 
+target_include_directories(xdot PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 # Installation location of library files
 install(
     TARGETS xdot
diff --git a/lib/xdot/Makefile.am b/lib/xdot/Makefile.am
index d1ad6af16..40b81ff8c 100644
--- a/lib/xdot/Makefile.am
+++ b/lib/xdot/Makefile.am
@@ -8,6 +8,8 @@ XDOT_VERSION="4:0:0"
 pdfdir = $(pkgdatadir)/doc/pdf
 pkginclude_HEADERS = xdot.h
 
+AM_CPPFLAGS = -I$(top_srcdir)/lib
+
 noinst_LTLIBRARIES = libxdot_C.la
 lib_LTLIBRARIES = libxdot.la
 pkgconfig_DATA = libxdot.pc
diff --git a/lib/xdot/xdot.c b/lib/xdot/xdot.c
index 4c5b8ab0e..5dee3cd88 100644
--- a/lib/xdot/xdot.c
+++ b/lib/xdot/xdot.c
@@ -10,7 +10,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include <xdot.h>
+#include <xdot/xdot.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/lib/xdot/xdot.vcxproj b/lib/xdot/xdot.vcxproj
index 68dccfbcf..d43ca4949 100644
--- a/lib/xdot/xdot.vcxproj
+++ b/lib/xdot/xdot.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>EXPORT_XDOT;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -70,7 +70,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>EXPORT_XDOT;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
-- 
2.40.0