From 13a1a6484eee9bea9c456f7b98214b33779eb22b Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 21 Aug 2020 18:06:17 -0700
Subject: [PATCH] disambiguate lib/osage/*.c #includes

Related to #1785.
---
 lib/osage/CMakeLists.txt | 19 ++++++++++---------
 lib/osage/Makefile.am    |  1 +
 lib/osage/osage.vcxproj  |  4 ++--
 lib/osage/osageinit.c    |  6 +++---
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/osage/CMakeLists.txt b/lib/osage/CMakeLists.txt
index b2e61abb9..56cd68e1f 100644
--- a/lib/osage/CMakeLists.txt
+++ b/lib/osage/CMakeLists.txt
@@ -1,4 +1,13 @@
-include_directories(
+add_library(osage STATIC
+    # Header files
+    osage.h
+
+    # Source files
+    osageinit.c
+)
+
+target_include_directories(osage PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
@@ -11,11 +20,3 @@ include_directories(
     ${GRAPHVIZ_LIB_DIR}/sfdpgen
     ${GRAPHVIZ_LIB_DIR}/sparse
 )
-
-add_library(osage STATIC
-    # Header files
-    osage.h
-
-    # Source files
-    osageinit.c
-)
diff --git a/lib/osage/Makefile.am b/lib/osage/Makefile.am
index 59a49f56c..5e08b42f9 100644
--- a/lib/osage/Makefile.am
+++ b/lib/osage/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/gvc \
 	-I$(top_srcdir)/lib/neatogen \
diff --git a/lib/osage/osage.vcxproj b/lib/osage/osage.vcxproj
index b4b54e2c2..5f52f90ee 100644
--- a/lib/osage/osage.vcxproj
+++ b/lib/osage/osage.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -66,7 +66,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
diff --git a/lib/osage/osageinit.c b/lib/osage/osageinit.c
index a8e1fdbba..2d8dcae08 100644
--- a/lib/osage/osageinit.c
+++ b/lib/osage/osageinit.c
@@ -16,9 +16,9 @@
  * Written by Emden R. Gansner
  */
 
-#include    "osage.h"
-#include    "neatoprocs.h"
-#include    "pack.h"
+#include    <osage/osage.h>
+#include    <neatogen/neatoprocs.h>
+#include    <pack/pack.h>
 
 #define CL_CHUNK 10
 #define DFLT_SZ  18
-- 
2.50.1