disambiguate plugin/neato_layout #includes

Related to #1785.

diff --git a/plugin/neato_layout/CMakeLists.txt b/plugin/neato_layout/CMakeLists.txt
index cc3764a89897356d502267cc4ef24c1cd68fc610..8e27c972174be956520ebaa7ee0dca07bcc9ec62 100644 (file)
--- a/plugin/neato_layout/CMakeLists.txt
+++ b/plugin/neato_layout/CMakeLists.txt
@@ -1,4 +1,11 @@
-include_directories(
+add_library(gvplugin_neato_layout SHARED
+    # Source files
+       gvplugin_neato_layout.c
+       gvlayout_neato_layout.c
+)
+
+target_include_directories(gvplugin_neato_layout PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
@@ -7,12 +14,6 @@ include_directories(
     ${GRAPHVIZ_LIB_DIR}/pathplan
 )
 
-add_library(gvplugin_neato_layout SHARED
-    # Source files
-       gvplugin_neato_layout.c
-       gvlayout_neato_layout.c
-)
-
 target_link_libraries(gvplugin_neato_layout
     cdt
     cgraph

diff --git a/plugin/neato_layout/Makefile.am b/plugin/neato_layout/Makefile.am
index d9ae87731b2ee7808ad488e16ce66e96cce9679a..19c86c5429c8f3e5f5599300fc19471bd27973a6 100644 (file)
--- a/plugin/neato_layout/Makefile.am
+++ b/plugin/neato_layout/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/neato_layout/gvlayout_neato_layout.c b/plugin/neato_layout/gvlayout_neato_layout.c
index d5b637aaf5be8502cd038b889b4f06d6b6cecf0e..85fcd1a321296a9599f8a53808dde984e3e3e1f7 100644 (file)
--- a/plugin/neato_layout/gvlayout_neato_layout.c
+++ b/plugin/neato_layout/gvlayout_neato_layout.c
@@ -21,10 +21,10 @@
 
 #include <stdio.h>
 
-#include "gvplugin_layout.h"
+#include <gvc/gvplugin_layout.h>
 
 /* FIXME - globals.h is needed for Nop */
-#include "globals.h"
+#include <common/globals.h>
 
 typedef enum { LAYOUT_NEATO,
                LAYOUT_FDP,

diff --git a/plugin/neato_layout/gvplugin_neato_layout.c b/plugin/neato_layout/gvplugin_neato_layout.c
index 59aa2462e562a65e47d7ac2f7523b07c4bb134bc..66599dc1179f4b8775a9f9aa21f3f604ab75d903 100644 (file)
--- a/plugin/neato_layout/gvplugin_neato_layout.c
+++ b/plugin/neato_layout/gvplugin_neato_layout.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 extern gvplugin_installed_t gvlayout_neato_types[];
 

diff --git a/plugin/neato_layout/gvplugin_neato_layout.vcxproj b/plugin/neato_layout/gvplugin_neato_layout.vcxproj
index 761cd41a302722b6bfeb236dada937e4bc379c17..5d849d9730a207a85401e6b03855fa47e2f42a4f 100644 (file)
--- a/plugin/neato_layout/gvplugin_neato_layout.vcxproj
+++ b/plugin/neato_layout/gvplugin_neato_layout.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\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -72,7 +72,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\pathplan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(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>
       <EnablePREfast>true</EnablePREfast>