From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 23 Aug 2020 00:14:53 +0000 (-0700)
Subject: disambiguate lib/vpsc/*.cpp #includes
X-Git-Tag: 2.46.0~20^2^2~90^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d70c0ef5661b835d915aa09ea734d5b1dd5517b8;p=graphviz

disambiguate lib/vpsc/*.cpp #includes

Related to #1785.
---

diff --git a/lib/vpsc/CMakeLists.txt b/lib/vpsc/CMakeLists.txt
index fa485888f..e6bc8784c 100644
--- a/lib/vpsc/CMakeLists.txt
+++ b/lib/vpsc/CMakeLists.txt
@@ -1,9 +1,5 @@
 if (with_ipsepcola)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
 add_library(vpsc STATIC
     # Header files
     block.h
@@ -29,4 +25,9 @@ add_library(vpsc STATIC
     variable.cpp
 )
 
-endif (with_ipsepcola)
\ No newline at end of file
+target_include_directories(vpsc PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+endif (with_ipsepcola)
diff --git a/lib/vpsc/Makefile.am b/lib/vpsc/Makefile.am
index 17b020318..3312c3403 100644
--- a/lib/vpsc/Makefile.am
+++ b/lib/vpsc/Makefile.am
@@ -1,6 +1,8 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+AM_CPPFLAGS = -I$(top_srcdir)/lib
+
 if WITH_IPSEPCOLA
 noinst_LTLIBRARIES = libvpsc_C.la
 endif
diff --git a/lib/vpsc/block.cpp b/lib/vpsc/block.cpp
index 7ece81bac..9e05bcd4e 100644
--- a/lib/vpsc/block.cpp
+++ b/lib/vpsc/block.cpp
@@ -17,10 +17,10 @@
  * Adaptagrams repository.
  */
 #include <cassert>
-#include "pairingheap/PairingHeap.h"
-#include "constraint.h"
-#include "block.h"
-#include "blocks.h"
+#include <vpsc/pairingheap/PairingHeap.h>
+#include <vpsc/constraint.h>
+#include <vpsc/block.h>
+#include <vpsc/blocks.h>
 #ifdef RECTANGLE_OVERLAP_LOGGING
 #include <fstream>
 using std::ios;
diff --git a/lib/vpsc/blocks.cpp b/lib/vpsc/blocks.cpp
index ee88eb4ae..2ef961df2 100644
--- a/lib/vpsc/blocks.cpp
+++ b/lib/vpsc/blocks.cpp
@@ -19,9 +19,9 @@
  * Adaptagrams repository.
  */
 
-#include "blocks.h"
-#include "block.h"
-#include "constraint.h"
+#include <vpsc/blocks.h>
+#include <vpsc/block.h>
+#include <vpsc/constraint.h>
 #ifdef RECTANGLE_OVERLAP_LOGGING
 #include <fstream>
 using std::ios;
diff --git a/lib/vpsc/constraint.cpp b/lib/vpsc/constraint.cpp
index cc96955d1..10fa5b485 100644
--- a/lib/vpsc/constraint.cpp
+++ b/lib/vpsc/constraint.cpp
@@ -16,7 +16,7 @@
  * Adaptagrams repository.
  */
 
-#include "constraint.h"
+#include <vpsc/constraint.h>
 #include <cassert>
 Constraint::Constraint(Variable *left, Variable *right, double gap, bool equality)
 : left(left),
diff --git a/lib/vpsc/csolve_VPSC.cpp b/lib/vpsc/csolve_VPSC.cpp
index 077f06c0d..0676d7353 100644
--- a/lib/vpsc/csolve_VPSC.cpp
+++ b/lib/vpsc/csolve_VPSC.cpp
@@ -17,13 +17,13 @@
 
 
 #include <iostream>
-#include <variable.h>
-#include <constraint.h>
-#include <generate-constraints.h>
-#include <solve_VPSC.h>
+#include <vpsc/variable.h>
+#include <vpsc/constraint.h>
+#include <vpsc/generate-constraints.h>
+#include <vpsc/solve_VPSC.h>
 #include <cstdlib>
 #include <cassert>
-#include "csolve_VPSC.h"
+#include <vpsc/csolve_VPSC.h>
 extern "C" {
 Variable* newVariable(int id, double desiredPos, double weight) {
 	return new Variable(id,desiredPos,weight);
diff --git a/lib/vpsc/generate-constraints.cpp b/lib/vpsc/generate-constraints.cpp
index e40b58df3..48a0bcc83 100644
--- a/lib/vpsc/generate-constraints.cpp
+++ b/lib/vpsc/generate-constraints.cpp
@@ -19,8 +19,8 @@
 #include <set>
 #include <cassert>
 #include <cstdlib>
-#include "generate-constraints.h"
-#include "constraint.h"
+#include <vpsc/generate-constraints.h>
+#include <vpsc/constraint.h>
 
 using std::set;
 using std::vector;
diff --git a/lib/vpsc/pairingheap/PairingHeap.cpp b/lib/vpsc/pairingheap/PairingHeap.cpp
index 40ab90de8..5864a18d8 100644
--- a/lib/vpsc/pairingheap/PairingHeap.cpp
+++ b/lib/vpsc/pairingheap/PairingHeap.cpp
@@ -24,8 +24,8 @@
 
 #include <vector>
 #include <list>
-#include "dsexceptions.h"
-#include "PairingHeap.h"
+#include <vpsc/pairingheap/dsexceptions.h>
+#include <vpsc/pairingheap/PairingHeap.h>
 
 #ifndef PAIRING_HEAP_CPP
 #define PAIRING_HEAP_CPP
diff --git a/lib/vpsc/remove_rectangle_overlap.cpp b/lib/vpsc/remove_rectangle_overlap.cpp
index 7b59905b4..11619808c 100644
--- a/lib/vpsc/remove_rectangle_overlap.cpp
+++ b/lib/vpsc/remove_rectangle_overlap.cpp
@@ -17,13 +17,13 @@
 
 #include <iostream>
 #include <cassert>
-#include "generate-constraints.h"
-#include "solve_VPSC.h"
-#include "variable.h"
-#include "constraint.h"
+#include <vpsc/generate-constraints.h>
+#include <vpsc/solve_VPSC.h>
+#include <vpsc/variable.h>
+#include <vpsc/constraint.h>
 #ifdef RECTANGLE_OVERLAP_LOGGING
 #include <fstream>
-#include "blocks.h"
+#include <vpsc/blocks.h>
 using std::ios;
 using std::ofstream;
 using std::endl;
diff --git a/lib/vpsc/solve_VPSC.cpp b/lib/vpsc/solve_VPSC.cpp
index a4dd13c2e..d6ce3acf4 100644
--- a/lib/vpsc/solve_VPSC.cpp
+++ b/lib/vpsc/solve_VPSC.cpp
@@ -17,10 +17,10 @@
  */
 
 #include <cassert>
-#include "constraint.h"
-#include "block.h"
-#include "blocks.h"
-#include "solve_VPSC.h"
+#include <vpsc/constraint.h>
+#include <vpsc/block.h>
+#include <vpsc/blocks.h>
+#include <vpsc/solve_VPSC.h>
 #include <math.h>
 #include <sstream>
 #ifdef RECTANGLE_OVERLAP_LOGGING
diff --git a/lib/vpsc/variable.cpp b/lib/vpsc/variable.cpp
index 27e160b9e..4dba3b80b 100644
--- a/lib/vpsc/variable.cpp
+++ b/lib/vpsc/variable.cpp
@@ -13,7 +13,7 @@
  * appreciated if you could also contribute those changes back to the
  * Adaptagrams repository.
  */
-#include "variable.h"
+#include <vpsc/variable.h>
 std::ostream& operator <<(std::ostream &os, const Variable &v) {
 	os << "(" << v.id << "=" << v.position() << ")";
 	return os;
diff --git a/lib/vpsc/vpsc.vcxproj b/lib/vpsc/vpsc.vcxproj
index 3791631e9..c3f5776e7 100644
--- a/lib/vpsc/vpsc.vcxproj
+++ b/lib/vpsc/vpsc.vcxproj
@@ -60,7 +60,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <EnablePREfast>true</EnablePREfast>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)/lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib />
   </ItemDefinitionGroup>
@@ -71,7 +71,7 @@
       <WarningLevel>Level4</WarningLevel>
       <EnablePREfast>true</EnablePREfast>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)/lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib />
   </ItemDefinitionGroup>