disambiguate lib/vpsc/*.cpp #includes

Related to #1785.

diff --git a/lib/vpsc/CMakeLists.txt b/lib/vpsc/CMakeLists.txt
index fa485888fb0a7b9231a7c0fe58bc08c3dd939612..e6bc8784c0131561265a39f126c48beecdf08996 100644 (file)
--- 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 17b020318fbf025fa9dbab7064e3da259ca6ea5e..3312c3403a97283ccc7018e5b85a08128bd7fa42 100644 (file)
--- 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 7ece81bacacb37690643bd277be071b4bd1c8fab..9e05bcd4e3d3efcae9cce6df7c3b19be84b6827b 100644 (file)
--- 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 ee88eb4aec859120ec0c22e27be7e4eb863de51a..2ef961df29d568a64852c13087b30a27bced50c4 100644 (file)
--- 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 cc96955d18800db0ca97e73b2188a037c8a7e89b..10fa5b485383fea2d646f7aae266a061027c5b8c 100644 (file)
--- 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 077f06c0d10ebe6045d131720c6e75bad8d5188b..0676d735338a99640aa11560f928f7d85a76e9f5 100644 (file)
--- 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 e40b58df3a2579799e7df389039a06ac72df4a9d..48a0bcc834fc713e7fa3c47c9f442a1290bebeb4 100644 (file)
--- 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 40ab90de84ca3c55e607b303fd0552eec73db177..5864a18d842a49eadfda0ca976b42f12f08f5d0e 100644 (file)
--- 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 7b59905b4edf048f95b6bab6e622465008296047..11619808c7589fc9f00bdaad3ad83b9af1a3e4b8 100644 (file)
--- 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 a4dd13c2eebf361e75cab760d03cff09a43e50aa..d6ce3acf4bfd41f01b5b811aa89191c77ecb5b1f 100644 (file)
--- 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 27e160b9ea9c8247758017f1a7c775178fdea321..4dba3b80b43e6ef5262a529e30fd8b4ebb847fe6 100644 (file)
--- 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 3791631e938942e055f39302216c74c595115d7e..c3f5776e76b8f3bcb04a0db454d8891d1a40195c 100644 (file)
--- 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>