From 8d9f00e3505000730f68feeba8edd508cc092c53 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Tue, 25 Aug 2020 18:53:34 -0700 Subject: [PATCH] disambiguate plugin/dot_layout #includes Related to #1785. --- plugin/dot_layout/CMakeLists.txt | 15 ++++++++------- plugin/dot_layout/Makefile.am | 1 + plugin/dot_layout/gvlayout_dot_layout.c | 2 +- plugin/dot_layout/gvplugin_dot_layout.c | 2 +- plugin/dot_layout/gvplugin_dot_layout.vcxproj | 4 ++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/plugin/dot_layout/CMakeLists.txt b/plugin/dot_layout/CMakeLists.txt index 4926142e0..5f6886bde 100644 --- a/plugin/dot_layout/CMakeLists.txt +++ b/plugin/dot_layout/CMakeLists.txt @@ -1,4 +1,11 @@ -include_directories( +add_library(gvplugin_dot_layout SHARED + # Source files + gvplugin_dot_layout.c + gvlayout_dot_layout.c +) + +target_include_directories(gvplugin_dot_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_dot_layout SHARED - # Source files - gvplugin_dot_layout.c - gvlayout_dot_layout.c -) - target_link_libraries(gvplugin_dot_layout cdt cgraph diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am index 041a451f4..257cc5a96 100644 --- a/plugin/dot_layout/Makefile.am +++ b/plugin/dot_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/dot_layout/gvlayout_dot_layout.c b/plugin/dot_layout/gvlayout_dot_layout.c index 3518644df..a1bcb159e 100644 --- a/plugin/dot_layout/gvlayout_dot_layout.c +++ b/plugin/dot_layout/gvlayout_dot_layout.c @@ -14,7 +14,7 @@ #include "config.h" -#include "gvplugin_layout.h" +#include typedef enum { LAYOUT_DOT, } layout_type; diff --git a/plugin/dot_layout/gvplugin_dot_layout.c b/plugin/dot_layout/gvplugin_dot_layout.c index 37be28af7..4deccb645 100644 --- a/plugin/dot_layout/gvplugin_dot_layout.c +++ b/plugin/dot_layout/gvplugin_dot_layout.c @@ -11,7 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "gvplugin.h" +#include extern gvplugin_installed_t gvlayout_dot_layout[]; diff --git a/plugin/dot_layout/gvplugin_dot_layout.vcxproj b/plugin/dot_layout/gvplugin_dot_layout.vcxproj index a2f0c60c4..fe807783b 100644 --- a/plugin/dot_layout/gvplugin_dot_layout.vcxproj +++ b/plugin/dot_layout/gvplugin_dot_layout.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) true EnableFastChecks MultiThreadedDebugDLL @@ -72,7 +72,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) Level4 true -- 2.40.0