disambiguate lib/pathplan/*.c #includes

Related to #1785.

diff --git a/lib/pathplan/CMakeLists.txt b/lib/pathplan/CMakeLists.txt
index 7ec68ced7f46854be700797ea0e81080e4709e58..552d6243b387821f6398e9d1294c03b05da786b8 100644 (file)
--- a/lib/pathplan/CMakeLists.txt
+++ b/lib/pathplan/CMakeLists.txt
@@ -1,7 +1,5 @@
 add_definitions(-D_BLD_pathplan -DPATHPLAN_EXPORTS)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
 add_library(pathplan SHARED
     # Header files
     pathgeom.h
@@ -27,6 +25,11 @@ add_library(pathplan SHARED
     pathplan.def
 )
 
+target_include_directories(pathplan PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 # Installation location of library files
 install(
     TARGETS pathplan

diff --git a/lib/pathplan/Makefile.am b/lib/pathplan/Makefile.am
index 4490374ada106806e20a13903a835b44c414f62a..3f631f1fa0d27e9631281162dacae66db7ee7afb 100644 (file)
--- a/lib/pathplan/Makefile.am
+++ b/lib/pathplan/Makefile.am
@@ -6,8 +6,10 @@ PATHPLAN_VERSION="4:0:0"
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig
 
+AM_CPPFLAGS = -I$(top_srcdir)/lib
+
 if WITH_WIN32
-AM_CPPFLAGS = -O0
+AM_CPPFLAGS += -O0
 endif
 
 pkginclude_HEADERS = pathgeom.h pathplan.h

diff --git a/lib/pathplan/Pathplan.vcxproj b/lib/pathplan/Pathplan.vcxproj
index 6f074112d719f435e0611c15ba5f08a0d2353126..6ea0ed43a5cd431ac48d1bf8721695bec5a4ecc1 100644 (file)
--- a/lib/pathplan/Pathplan.vcxproj
+++ b/lib/pathplan/Pathplan.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -72,7 +72,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/pathplan/cvt.c b/lib/pathplan/cvt.c
index 5d22194d145c4eeede5d4f681c4e87d07ea56e31..5a0c56ddb9c97d8061d28dd755e824156ce49b80 100644 (file)
--- a/lib/pathplan/cvt.c
+++ b/lib/pathplan/cvt.c
@@ -13,7 +13,7 @@
 
 
 #include <stdio.h>
-#include "vis.h"
+#include <pathplan/vis.h>
 
 typedef Ppoint_t ilcoord_t;
 

diff --git a/lib/pathplan/inpoly.c b/lib/pathplan/inpoly.c
index 192d1ccea4ab7e98c8868d1e1eb348f28887f076..708320f9f76c50033b972df024c29b42d402ebed 100644 (file)
--- a/lib/pathplan/inpoly.c
+++ b/lib/pathplan/inpoly.c
@@ -19,8 +19,8 @@
  */
 
 #include <stdlib.h>
-#include "vispath.h"
-#include "pathutil.h"
+#include <pathplan/vispath.h>
+#include <pathplan/pathutil.h>
 
 int in_poly(Ppoly_t poly, Ppoint_t q)
 {

diff --git a/lib/pathplan/route.c b/lib/pathplan/route.c
index 5a35710e6b4cf60b0ce1f6798069a32c337a4854..9e080122100f9faa99f05920ec0b8ca0f5679192 100644 (file)
--- a/lib/pathplan/route.c
+++ b/lib/pathplan/route.c
@@ -17,8 +17,8 @@
 #include <setjmp.h>
 #include <stdlib.h>
 #include <math.h>
-#include "pathutil.h"
-#include "solvers.h"
+#include <pathplan/pathutil.h>
+#include <pathplan/solvers.h>
 
 #define EPSILON1 1E-3
 #define EPSILON2 1E-6

diff --git a/lib/pathplan/shortest.c b/lib/pathplan/shortest.c
index 40dd055ad37fca7657fbc91a65b9cbad05b8040c..58428abc231ea2e9dea0496173113a0fe89568d1 100644 (file)
--- a/lib/pathplan/shortest.c
+++ b/lib/pathplan/shortest.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <math.h>
-#include "pathutil.h"
+#include <pathplan/pathutil.h>
 
 #define ISCCW 1
 #define ISCW  2

diff --git a/lib/pathplan/shortestpth.c b/lib/pathplan/shortestpth.c
index a09266ac576d8b8a9420abd7c08a085bfb525dc0..a79e660f3386adc1407328b509a2d5f0540deca8 100644 (file)
--- a/lib/pathplan/shortestpth.c
+++ b/lib/pathplan/shortestpth.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include "vis.h"
+#include <pathplan/vis.h>
 
 static COORD unseen = (double) INT_MAX;
 

diff --git a/lib/pathplan/solvers.c b/lib/pathplan/solvers.c
index 619f58dc5ce76da27321efb6684e92f34c319c17..1d76ed47311fe5d55238c1aea760cca3ab25fbfc 100644 (file)
--- a/lib/pathplan/solvers.c
+++ b/lib/pathplan/solvers.c
@@ -14,7 +14,7 @@
 
 #include "config.h"
 #include <math.h>
-#include "solvers.h"
+#include <pathplan/solvers.h>
 
 #ifndef HAVE_CBRT
 #define cbrt(x) ((x < 0) ? (-1*pow(-x, 1.0/3.0)) : pow (x, 1.0/3.0))

diff --git a/lib/pathplan/triang.c b/lib/pathplan/triang.c
index 7280243121c34ad79517eadeab45a7fe83397819..4923255b9c551cb90ad5350045bc979a73174b64 100644 (file)
--- a/lib/pathplan/triang.c
+++ b/lib/pathplan/triang.c
@@ -16,8 +16,8 @@
 #include <math.h>
 #include <stdlib.h>
 #include <setjmp.h>
-#include "pathutil.h"
-#include "tri.h"
+#include <pathplan/pathutil.h>
+#include <pathplan/tri.h>
 
 typedef struct lvertex_2_t {
     double x, y;

diff --git a/lib/pathplan/util.c b/lib/pathplan/util.c
index 5fabe03d6fa91b68c869e14f7062a464f70f647b..01844d47de4e0cb9fb34bd10a80bc2304a1688e6 100644 (file)
--- a/lib/pathplan/util.c
+++ b/lib/pathplan/util.c
@@ -14,7 +14,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include "pathutil.h"
+#include <pathplan/pathutil.h>
 
 #define ALLOC(size,ptr,type) (ptr? (type*)realloc(ptr,(size)*sizeof(type)):(type*)malloc((size)*sizeof(type)))
 

diff --git a/lib/pathplan/visibility.c b/lib/pathplan/visibility.c
index 33b9e54da502141af3d97a5b98e8b065f30bfea9..6549b333f5d710f72d866cf1132e26ecfa98e93a 100644 (file)
--- a/lib/pathplan/visibility.c
+++ b/lib/pathplan/visibility.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include "vis.h"
+#include <pathplan/vis.h>
 
        /* TRANSPARENT means router sees past colinear obstacles */
 #ifdef TRANSPARENT