Put adaptagrams into its own folder

285 files changed, 18 insertions, 15 deletions

diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
index 13b736ebf..116f2cfc5 100644
--- a/src/3rdparty/CMakeLists.txt
+++ b/src/3rdparty/CMakeLists.txt
@@ -2,3 +2,5 @@
 add_subdirectory(libuemf)
 add_subdirectory(libcroco)
 add_subdirectory(libdepixelize)
+add_subdirectory(adaptagrams)
+
diff --git a/src/3rdparty/adaptagrams/CMakeLists.txt b/src/3rdparty/adaptagrams/CMakeLists.txt
new file mode 100644
index 000000000..60db79d29
--- /dev/null
+++ b/src/3rdparty/adaptagrams/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory(libavoid)
+add_subdirectory(libcola)
+add_subdirectory(libvpsc)
diff --git a/src/libavoid/CMakeLists.txt b/src/3rdparty/adaptagrams/libavoid/CMakeLists.txt
index bae681f11..e14f8ea24 100644
--- a/src/libavoid/CMakeLists.txt
+++ b/src/3rdparty/adaptagrams/libavoid/CMakeLists.txt
@@ -54,5 +54,5 @@ set(libavoid_SRC
 	visibility.h
 	vpsc.h
 )
-
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
 add_inkscape_lib(avoid_LIB "${libavoid_SRC}")
diff --git a/src/libavoid/Doxyfile b/src/3rdparty/adaptagrams/libavoid/Doxyfile
index bfe8bf8bd..bfe8bf8bd 100644
--- a/src/libavoid/Doxyfile
+++ b/src/3rdparty/adaptagrams/libavoid/Doxyfile
diff --git a/src/libavoid/LICENSE.LGPL b/src/3rdparty/adaptagrams/libavoid/LICENSE.LGPL
index 9c8ccdec6..9c8ccdec6 100644
--- a/src/libavoid/LICENSE.LGPL
+++ b/src/3rdparty/adaptagrams/libavoid/LICENSE.LGPL
diff --git a/src/libavoid/Makefile.am b/src/3rdparty/adaptagrams/libavoid/Makefile.am
index 837dacb57..837dacb57 100644
--- a/src/libavoid/Makefile.am
+++ b/src/3rdparty/adaptagrams/libavoid/Makefile.am
diff --git a/src/libavoid/README b/src/3rdparty/adaptagrams/libavoid/README
index fe62f13b0..fe62f13b0 100644
--- a/src/libavoid/README
+++ b/src/3rdparty/adaptagrams/libavoid/README
diff --git a/src/libavoid/actioninfo.cpp b/src/3rdparty/adaptagrams/libavoid/actioninfo.cpp
index b896cb960..b896cb960 100644
--- a/src/libavoid/actioninfo.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/actioninfo.cpp
diff --git a/src/libavoid/actioninfo.h b/src/3rdparty/adaptagrams/libavoid/actioninfo.h
index 32f009f10..32f009f10 100644
--- a/src/libavoid/actioninfo.h
+++ b/src/3rdparty/adaptagrams/libavoid/actioninfo.h
diff --git a/src/libavoid/assertions.h b/src/3rdparty/adaptagrams/libavoid/assertions.h
index 17156225a..17156225a 100644
--- a/src/libavoid/assertions.h
+++ b/src/3rdparty/adaptagrams/libavoid/assertions.h
diff --git a/src/libavoid/connectionpin.cpp b/src/3rdparty/adaptagrams/libavoid/connectionpin.cpp
index 5594d807c..5594d807c 100644
--- a/src/libavoid/connectionpin.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/connectionpin.cpp
diff --git a/src/libavoid/connectionpin.h b/src/3rdparty/adaptagrams/libavoid/connectionpin.h
index 5e3379347..5e3379347 100644
--- a/src/libavoid/connectionpin.h
+++ b/src/3rdparty/adaptagrams/libavoid/connectionpin.h
diff --git a/src/libavoid/connector.cpp b/src/3rdparty/adaptagrams/libavoid/connector.cpp
index de4206e33..de4206e33 100644
--- a/src/libavoid/connector.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/connector.cpp
diff --git a/src/libavoid/connector.h b/src/3rdparty/adaptagrams/libavoid/connector.h
index 56f1b0263..56f1b0263 100644
--- a/src/libavoid/connector.h
+++ b/src/3rdparty/adaptagrams/libavoid/connector.h
diff --git a/src/libavoid/connend.cpp b/src/3rdparty/adaptagrams/libavoid/connend.cpp
index 3929e8d71..3929e8d71 100644
--- a/src/libavoid/connend.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/connend.cpp
diff --git a/src/libavoid/connend.h b/src/3rdparty/adaptagrams/libavoid/connend.h
index 3288fa14d..3288fa14d 100644
--- a/src/libavoid/connend.h
+++ b/src/3rdparty/adaptagrams/libavoid/connend.h
diff --git a/src/libavoid/debug.h b/src/3rdparty/adaptagrams/libavoid/debug.h
index 5f73dcf16..5f73dcf16 100644
--- a/src/libavoid/debug.h
+++ b/src/3rdparty/adaptagrams/libavoid/debug.h
diff --git a/src/libavoid/debughandler.h b/src/3rdparty/adaptagrams/libavoid/debughandler.h
index 52d803c8a..52d803c8a 100644
--- a/src/libavoid/debughandler.h
+++ b/src/3rdparty/adaptagrams/libavoid/debughandler.h
diff --git a/src/libavoid/dllexport.h b/src/3rdparty/adaptagrams/libavoid/dllexport.h
index d8c63d6d0..d8c63d6d0 100644
--- a/src/libavoid/dllexport.h
+++ b/src/3rdparty/adaptagrams/libavoid/dllexport.h
diff --git a/src/libavoid/doc/description.doc b/src/3rdparty/adaptagrams/libavoid/doc/description.doc
index 6ada6e4ee..6ada6e4ee 100644
--- a/src/libavoid/doc/description.doc
+++ b/src/3rdparty/adaptagrams/libavoid/doc/description.doc
diff --git a/src/libavoid/doc/example.doc b/src/3rdparty/adaptagrams/libavoid/doc/example.doc
index a23933d22..a23933d22 100644
--- a/src/libavoid/doc/example.doc
+++ b/src/3rdparty/adaptagrams/libavoid/doc/example.doc
diff --git a/src/libavoid/doc/header.html b/src/3rdparty/adaptagrams/libavoid/doc/header.html
index d1c7c61c8..d1c7c61c8 100644
--- a/src/libavoid/doc/header.html
+++ b/src/3rdparty/adaptagrams/libavoid/doc/header.html
diff --git a/src/libavoid/geometry.cpp b/src/3rdparty/adaptagrams/libavoid/geometry.cpp
index 7f50800dc..7f50800dc 100644
--- a/src/libavoid/geometry.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/geometry.cpp
diff --git a/src/libavoid/geometry.h b/src/3rdparty/adaptagrams/libavoid/geometry.h
index 47f119996..47f119996 100644
--- a/src/libavoid/geometry.h
+++ b/src/3rdparty/adaptagrams/libavoid/geometry.h
diff --git a/src/libavoid/geomtypes.cpp b/src/3rdparty/adaptagrams/libavoid/geomtypes.cpp
index c82d1badc..c82d1badc 100644
--- a/src/libavoid/geomtypes.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/geomtypes.cpp
diff --git a/src/libavoid/geomtypes.h b/src/3rdparty/adaptagrams/libavoid/geomtypes.h
index e370360da..e370360da 100644
--- a/src/libavoid/geomtypes.h
+++ b/src/3rdparty/adaptagrams/libavoid/geomtypes.h
diff --git a/src/libavoid/graph.cpp b/src/3rdparty/adaptagrams/libavoid/graph.cpp
index 280a347fa..280a347fa 100644
--- a/src/libavoid/graph.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/graph.cpp
diff --git a/src/libavoid/graph.h b/src/3rdparty/adaptagrams/libavoid/graph.h
index 9e1a7a330..9e1a7a330 100644
--- a/src/libavoid/graph.h
+++ b/src/3rdparty/adaptagrams/libavoid/graph.h
diff --git a/src/libavoid/hyperedge.cpp b/src/3rdparty/adaptagrams/libavoid/hyperedge.cpp
index 87a0fbf79..87a0fbf79 100644
--- a/src/libavoid/hyperedge.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/hyperedge.cpp
diff --git a/src/libavoid/hyperedge.h b/src/3rdparty/adaptagrams/libavoid/hyperedge.h
index 47ee42c76..47ee42c76 100644
--- a/src/libavoid/hyperedge.h
+++ b/src/3rdparty/adaptagrams/libavoid/hyperedge.h
diff --git a/src/libavoid/hyperedgeimprover.cpp b/src/3rdparty/adaptagrams/libavoid/hyperedgeimprover.cpp
index 62d026093..62d026093 100644
--- a/src/libavoid/hyperedgeimprover.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/hyperedgeimprover.cpp
diff --git a/src/libavoid/hyperedgeimprover.h b/src/3rdparty/adaptagrams/libavoid/hyperedgeimprover.h
index 48ca11ead..48ca11ead 100644
--- a/src/libavoid/hyperedgeimprover.h
+++ b/src/3rdparty/adaptagrams/libavoid/hyperedgeimprover.h
diff --git a/src/libavoid/hyperedgetree.cpp b/src/3rdparty/adaptagrams/libavoid/hyperedgetree.cpp
index d795be801..d795be801 100644
--- a/src/libavoid/hyperedgetree.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/hyperedgetree.cpp
diff --git a/src/libavoid/hyperedgetree.h b/src/3rdparty/adaptagrams/libavoid/hyperedgetree.h
index 91c30ad52..91c30ad52 100644
--- a/src/libavoid/hyperedgetree.h
+++ b/src/3rdparty/adaptagrams/libavoid/hyperedgetree.h
diff --git a/src/libavoid/junction.cpp b/src/3rdparty/adaptagrams/libavoid/junction.cpp
index a1918b4a3..a1918b4a3 100644
--- a/src/libavoid/junction.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/junction.cpp
diff --git a/src/libavoid/junction.h b/src/3rdparty/adaptagrams/libavoid/junction.h
index ed73fac34..ed73fac34 100644
--- a/src/libavoid/junction.h
+++ b/src/3rdparty/adaptagrams/libavoid/junction.h
diff --git a/src/libavoid/libavoid.h b/src/3rdparty/adaptagrams/libavoid/libavoid.h
index 3151a3e9a..3151a3e9a 100644
--- a/src/libavoid/libavoid.h
+++ b/src/3rdparty/adaptagrams/libavoid/libavoid.h
diff --git a/src/libavoid/libavoid.pc.in b/src/3rdparty/adaptagrams/libavoid/libavoid.pc.in
index 8f16d060a..8f16d060a 100644
--- a/src/libavoid/libavoid.pc.in
+++ b/src/3rdparty/adaptagrams/libavoid/libavoid.pc.in
diff --git a/src/libavoid/libavoid.sln b/src/3rdparty/adaptagrams/libavoid/libavoid.sln
index aa9f8e15a..aa9f8e15a 100755
--- a/src/libavoid/libavoid.sln
+++ b/src/3rdparty/adaptagrams/libavoid/libavoid.sln
diff --git a/src/libavoid/libavoid.vcxproj b/src/3rdparty/adaptagrams/libavoid/libavoid.vcxproj
index b0c4574c0..b0c4574c0 100755
--- a/src/libavoid/libavoid.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/libavoid.vcxproj
diff --git a/src/libavoid/makepath.cpp b/src/3rdparty/adaptagrams/libavoid/makepath.cpp
index 329d5974d..329d5974d 100644
--- a/src/libavoid/makepath.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/makepath.cpp
diff --git a/src/libavoid/makepath.h b/src/3rdparty/adaptagrams/libavoid/makepath.h
index 2e4b5ba9a..2e4b5ba9a 100644
--- a/src/libavoid/makepath.h
+++ b/src/3rdparty/adaptagrams/libavoid/makepath.h
diff --git a/src/libavoid/mtst.cpp b/src/3rdparty/adaptagrams/libavoid/mtst.cpp
index 7aac2b58e..7aac2b58e 100644
--- a/src/libavoid/mtst.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/mtst.cpp
diff --git a/src/libavoid/mtst.h b/src/3rdparty/adaptagrams/libavoid/mtst.h
index bf9e2b07c..bf9e2b07c 100644
--- a/src/libavoid/mtst.h
+++ b/src/3rdparty/adaptagrams/libavoid/mtst.h
diff --git a/src/libavoid/obstacle.cpp b/src/3rdparty/adaptagrams/libavoid/obstacle.cpp
index 06eadde26..06eadde26 100644
--- a/src/libavoid/obstacle.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/obstacle.cpp
diff --git a/src/libavoid/obstacle.h b/src/3rdparty/adaptagrams/libavoid/obstacle.h
index 12c5eca14..12c5eca14 100644
--- a/src/libavoid/obstacle.h
+++ b/src/3rdparty/adaptagrams/libavoid/obstacle.h
diff --git a/src/libavoid/orthogonal.cpp b/src/3rdparty/adaptagrams/libavoid/orthogonal.cpp
index 2558e0d73..2558e0d73 100644
--- a/src/libavoid/orthogonal.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/orthogonal.cpp
diff --git a/src/libavoid/orthogonal.h b/src/3rdparty/adaptagrams/libavoid/orthogonal.h
index 00ee465de..00ee465de 100644
--- a/src/libavoid/orthogonal.h
+++ b/src/3rdparty/adaptagrams/libavoid/orthogonal.h
diff --git a/src/libavoid/router.cpp b/src/3rdparty/adaptagrams/libavoid/router.cpp
index 84f919f3d..84f919f3d 100644
--- a/src/libavoid/router.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/router.cpp
diff --git a/src/libavoid/router.h b/src/3rdparty/adaptagrams/libavoid/router.h
index e7cbd4169..e7cbd4169 100644
--- a/src/libavoid/router.h
+++ b/src/3rdparty/adaptagrams/libavoid/router.h
diff --git a/src/libavoid/scanline.cpp b/src/3rdparty/adaptagrams/libavoid/scanline.cpp
index 8b4993478..8b4993478 100644
--- a/src/libavoid/scanline.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/scanline.cpp
diff --git a/src/libavoid/scanline.h b/src/3rdparty/adaptagrams/libavoid/scanline.h
index 5a6d0294a..5a6d0294a 100644
--- a/src/libavoid/scanline.h
+++ b/src/3rdparty/adaptagrams/libavoid/scanline.h
diff --git a/src/libavoid/shape.cpp b/src/3rdparty/adaptagrams/libavoid/shape.cpp
index 038f5fddb..038f5fddb 100644
--- a/src/libavoid/shape.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/shape.cpp
diff --git a/src/libavoid/shape.h b/src/3rdparty/adaptagrams/libavoid/shape.h
index f6d70763a..f6d70763a 100644
--- a/src/libavoid/shape.h
+++ b/src/3rdparty/adaptagrams/libavoid/shape.h
diff --git a/src/libavoid/tests/2junctions.cpp b/src/3rdparty/adaptagrams/libavoid/tests/2junctions.cpp
index 0165d3514..0165d3514 100644
--- a/src/libavoid/tests/2junctions.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/2junctions.cpp
diff --git a/src/libavoid/tests/Makefile.am b/src/3rdparty/adaptagrams/libavoid/tests/Makefile.am
index 3fc432462..3fc432462 100644
--- a/src/libavoid/tests/Makefile.am
+++ b/src/3rdparty/adaptagrams/libavoid/tests/Makefile.am
diff --git a/src/libavoid/tests/buildOrthogonalChannelInfo1.cpp b/src/3rdparty/adaptagrams/libavoid/tests/buildOrthogonalChannelInfo1.cpp
index ef2144adc..ef2144adc 100644
--- a/src/libavoid/tests/buildOrthogonalChannelInfo1.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/buildOrthogonalChannelInfo1.cpp
diff --git a/src/libavoid/tests/checkpointNudging1.cpp b/src/3rdparty/adaptagrams/libavoid/tests/checkpointNudging1.cpp
index 7379e90bd..7379e90bd 100644
--- a/src/libavoid/tests/checkpointNudging1.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/checkpointNudging1.cpp
diff --git a/src/libavoid/tests/checkpointNudging2.cpp b/src/3rdparty/adaptagrams/libavoid/tests/checkpointNudging2.cpp
index f06b14863..f06b14863 100644
--- a/src/libavoid/tests/checkpointNudging2.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/checkpointNudging2.cpp
diff --git a/src/libavoid/tests/checkpointNudging3.cpp b/src/3rdparty/adaptagrams/libavoid/tests/checkpointNudging3.cpp
index 7c31d8796..7c31d8796 100644
--- a/src/libavoid/tests/checkpointNudging3.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/checkpointNudging3.cpp
diff --git a/src/libavoid/tests/checkpoints01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/checkpoints01.cpp
index 83ea0ffda..83ea0ffda 100644
--- a/src/libavoid/tests/checkpoints01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/checkpoints01.cpp
diff --git a/src/libavoid/tests/checkpoints02.cpp b/src/3rdparty/adaptagrams/libavoid/tests/checkpoints02.cpp
index c6fa9ee22..c6fa9ee22 100644
--- a/src/libavoid/tests/checkpoints02.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/checkpoints02.cpp
diff --git a/src/libavoid/tests/checkpoints03.cpp b/src/3rdparty/adaptagrams/libavoid/tests/checkpoints03.cpp
index 15da7062f..15da7062f 100644
--- a/src/libavoid/tests/checkpoints03.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/checkpoints03.cpp
diff --git a/src/libavoid/tests/complex.cpp b/src/3rdparty/adaptagrams/libavoid/tests/complex.cpp
index 81134c2e5..81134c2e5 100644
--- a/src/libavoid/tests/complex.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/complex.cpp
diff --git a/src/libavoid/tests/connectionpin01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/connectionpin01.cpp
index 92c3760f7..92c3760f7 100644
--- a/src/libavoid/tests/connectionpin01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/connectionpin01.cpp
diff --git a/src/libavoid/tests/connectionpin02.cpp b/src/3rdparty/adaptagrams/libavoid/tests/connectionpin02.cpp
index 5724150d7..5724150d7 100644
--- a/src/libavoid/tests/connectionpin02.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/connectionpin02.cpp
diff --git a/src/libavoid/tests/connectionpin03.cpp b/src/3rdparty/adaptagrams/libavoid/tests/connectionpin03.cpp
index a8778176f..a8778176f 100644
--- a/src/libavoid/tests/connectionpin03.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/connectionpin03.cpp
diff --git a/src/libavoid/tests/connendmove.cpp b/src/3rdparty/adaptagrams/libavoid/tests/connendmove.cpp
index dfcbf8e82..dfcbf8e82 100644
--- a/src/libavoid/tests/connendmove.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/connendmove.cpp
diff --git a/src/libavoid/tests/corneroverlap01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/corneroverlap01.cpp
index a0db76d9d..a0db76d9d 100644
--- a/src/libavoid/tests/corneroverlap01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/corneroverlap01.cpp
diff --git a/src/libavoid/tests/endlessLoop01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/endlessLoop01.cpp
index 664fb1d8e..664fb1d8e 100644
--- a/src/libavoid/tests/endlessLoop01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/endlessLoop01.cpp
diff --git a/src/libavoid/tests/example.cpp b/src/3rdparty/adaptagrams/libavoid/tests/example.cpp
index b9cfdb01a..b9cfdb01a 100644
--- a/src/libavoid/tests/example.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/example.cpp
diff --git a/src/libavoid/tests/finalSegmentNudging1.cpp b/src/3rdparty/adaptagrams/libavoid/tests/finalSegmentNudging1.cpp
index 0408e46a5..0408e46a5 100644
--- a/src/libavoid/tests/finalSegmentNudging1.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/finalSegmentNudging1.cpp
diff --git a/src/libavoid/tests/finalSegmentNudging2.cpp b/src/3rdparty/adaptagrams/libavoid/tests/finalSegmentNudging2.cpp
index 712a0ddc1..712a0ddc1 100644
--- a/src/libavoid/tests/finalSegmentNudging2.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/finalSegmentNudging2.cpp
diff --git a/src/libavoid/tests/finalSegmentNudging3.cpp b/src/3rdparty/adaptagrams/libavoid/tests/finalSegmentNudging3.cpp
index 6cb001086..6cb001086 100644
--- a/src/libavoid/tests/finalSegmentNudging3.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/finalSegmentNudging3.cpp
diff --git a/src/libavoid/tests/forwardFlowingConnectors01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/forwardFlowingConnectors01.cpp
index 61d23744e..61d23744e 100644
--- a/src/libavoid/tests/forwardFlowingConnectors01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/forwardFlowingConnectors01.cpp
diff --git a/src/libavoid/tests/freeFloatingDirection01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/freeFloatingDirection01.cpp
index 56e1773f9..56e1773f9 100644
--- a/src/libavoid/tests/freeFloatingDirection01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/freeFloatingDirection01.cpp
diff --git a/src/libavoid/tests/hola01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/hola01.cpp
index eeb29e622..eeb29e622 100644
--- a/src/libavoid/tests/hola01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/hola01.cpp
diff --git a/src/libavoid/tests/hyperedge01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/hyperedge01.cpp
index 2997088e6..2997088e6 100644
--- a/src/libavoid/tests/hyperedge01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/hyperedge01.cpp
diff --git a/src/libavoid/tests/hyperedge02.cpp b/src/3rdparty/adaptagrams/libavoid/tests/hyperedge02.cpp
index 46d4b76ad..46d4b76ad 100644
--- a/src/libavoid/tests/hyperedge02.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/hyperedge02.cpp
diff --git a/src/libavoid/tests/hyperedgeLoop1.cpp b/src/3rdparty/adaptagrams/libavoid/tests/hyperedgeLoop1.cpp
index d59b96c43..d59b96c43 100644
--- a/src/libavoid/tests/hyperedgeLoop1.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/hyperedgeLoop1.cpp
diff --git a/src/libavoid/tests/hyperedgeRerouting01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/hyperedgeRerouting01.cpp
index 2aa81f24f..2aa81f24f 100644
--- a/src/libavoid/tests/hyperedgeRerouting01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/hyperedgeRerouting01.cpp
diff --git a/src/libavoid/tests/improveHyperedge01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge01.cpp
index 092689c8e..092689c8e 100644
--- a/src/libavoid/tests/improveHyperedge01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge01.cpp
diff --git a/src/libavoid/tests/improveHyperedge02.cpp b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge02.cpp
index 9eb1d2b6e..9eb1d2b6e 100644
--- a/src/libavoid/tests/improveHyperedge02.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge02.cpp
diff --git a/src/libavoid/tests/improveHyperedge03.cpp b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge03.cpp
index 5dd6d2c9e..5dd6d2c9e 100644
--- a/src/libavoid/tests/improveHyperedge03.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge03.cpp
diff --git a/src/libavoid/tests/improveHyperedge04.cpp b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge04.cpp
index 9ed66dab7..9ed66dab7 100644
--- a/src/libavoid/tests/improveHyperedge04.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge04.cpp
diff --git a/src/libavoid/tests/improveHyperedge05.cpp b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge05.cpp
index ff6ba171c..ff6ba171c 100644
--- a/src/libavoid/tests/improveHyperedge05.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge05.cpp
diff --git a/src/libavoid/tests/improveHyperedge06.cpp b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge06.cpp
index 3322b9835..3322b9835 100644
--- a/src/libavoid/tests/improveHyperedge06.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/improveHyperedge06.cpp
diff --git a/src/libavoid/tests/infinity.cpp b/src/3rdparty/adaptagrams/libavoid/tests/infinity.cpp
index 1fbf683a3..1fbf683a3 100644
--- a/src/libavoid/tests/infinity.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/infinity.cpp
diff --git a/src/libavoid/tests/inline.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inline.cpp
index ee10ce949..ee10ce949 100644
--- a/src/libavoid/tests/inline.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inline.cpp
diff --git a/src/libavoid/tests/inlineOverlap09.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineOverlap09.cpp
index 1ab9c6d5b..1ab9c6d5b 100644
--- a/src/libavoid/tests/inlineOverlap09.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineOverlap09.cpp
diff --git a/src/libavoid/tests/inlineOverlap10.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineOverlap10.cpp
index 218228291..218228291 100644
--- a/src/libavoid/tests/inlineOverlap10.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineOverlap10.cpp
diff --git a/src/libavoid/tests/inlineOverlap11.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineOverlap11.cpp
index 46cdd87ba..46cdd87ba 100644
--- a/src/libavoid/tests/inlineOverlap11.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineOverlap11.cpp
diff --git a/src/libavoid/tests/inlineShapes.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineShapes.cpp
index 510c91c78..510c91c78 100644
--- a/src/libavoid/tests/inlineShapes.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineShapes.cpp
diff --git a/src/libavoid/tests/inlineoverlap01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap01.cpp
index ff4a3090f..ff4a3090f 100644
--- a/src/libavoid/tests/inlineoverlap01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap01.cpp
diff --git a/src/libavoid/tests/inlineoverlap02.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap02.cpp
index 4e1c04497..4e1c04497 100644
--- a/src/libavoid/tests/inlineoverlap02.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap02.cpp
diff --git a/src/libavoid/tests/inlineoverlap03.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap03.cpp
index 945cd72ab..945cd72ab 100644
--- a/src/libavoid/tests/inlineoverlap03.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap03.cpp
diff --git a/src/libavoid/tests/inlineoverlap04.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap04.cpp
index 70847bc02..70847bc02 100644
--- a/src/libavoid/tests/inlineoverlap04.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap04.cpp
diff --git a/src/libavoid/tests/inlineoverlap05.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap05.cpp
index 109267902..109267902 100644
--- a/src/libavoid/tests/inlineoverlap05.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap05.cpp
diff --git a/src/libavoid/tests/inlineoverlap06.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap06.cpp
index 8319c295f..8319c295f 100644
--- a/src/libavoid/tests/inlineoverlap06.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap06.cpp
diff --git a/src/libavoid/tests/inlineoverlap07.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap07.cpp
index cff0c1900..cff0c1900 100644
--- a/src/libavoid/tests/inlineoverlap07.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap07.cpp
diff --git a/src/libavoid/tests/inlineoverlap08.cpp b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap08.cpp
index cde44e0e9..cde44e0e9 100644
--- a/src/libavoid/tests/inlineoverlap08.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/inlineoverlap08.cpp
diff --git a/src/libavoid/tests/junction01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/junction01.cpp
index 24d4b5f14..24d4b5f14 100644
--- a/src/libavoid/tests/junction01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/junction01.cpp
diff --git a/src/libavoid/tests/junction02.cpp b/src/3rdparty/adaptagrams/libavoid/tests/junction02.cpp
index 51d9e94f2..51d9e94f2 100644
--- a/src/libavoid/tests/junction02.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/junction02.cpp
diff --git a/src/libavoid/tests/junction03.cpp b/src/3rdparty/adaptagrams/libavoid/tests/junction03.cpp
index 7eab3c0fb..7eab3c0fb 100644
--- a/src/libavoid/tests/junction03.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/junction03.cpp
diff --git a/src/libavoid/tests/junction04.cpp b/src/3rdparty/adaptagrams/libavoid/tests/junction04.cpp
index b22505f5f..b22505f5f 100644
--- a/src/libavoid/tests/junction04.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/junction04.cpp
diff --git a/src/libavoid/tests/latesetup.cpp b/src/3rdparty/adaptagrams/libavoid/tests/latesetup.cpp
index e308887d8..e308887d8 100644
--- a/src/libavoid/tests/latesetup.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/latesetup.cpp
diff --git a/src/libavoid/tests/lineSegWrapperCrash1.cpp b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash1.cpp
index 0b504cf21..0b504cf21 100644
--- a/src/libavoid/tests/lineSegWrapperCrash1.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash1.cpp
diff --git a/src/libavoid/tests/lineSegWrapperCrash2.cpp b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash2.cpp
index f2ee8d43c..f2ee8d43c 100644
--- a/src/libavoid/tests/lineSegWrapperCrash2.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash2.cpp
diff --git a/src/libavoid/tests/lineSegWrapperCrash3.cpp b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash3.cpp
index 36c8d04b2..36c8d04b2 100644
--- a/src/libavoid/tests/lineSegWrapperCrash3.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash3.cpp
diff --git a/src/libavoid/tests/lineSegWrapperCrash4.cpp b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash4.cpp
index 3b03533b9..3b03533b9 100644
--- a/src/libavoid/tests/lineSegWrapperCrash4.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash4.cpp
diff --git a/src/libavoid/tests/lineSegWrapperCrash5.cpp b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash5.cpp
index cb498621b..cb498621b 100644
--- a/src/libavoid/tests/lineSegWrapperCrash5.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash5.cpp
diff --git a/src/libavoid/tests/lineSegWrapperCrash6.cpp b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash6.cpp
index fb186b78d..fb186b78d 100644
--- a/src/libavoid/tests/lineSegWrapperCrash6.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash6.cpp
diff --git a/src/libavoid/tests/lineSegWrapperCrash7.cpp b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash7.cpp
index 40f5d4ae7..40f5d4ae7 100644
--- a/src/libavoid/tests/lineSegWrapperCrash7.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash7.cpp
diff --git a/src/libavoid/tests/lineSegWrapperCrash8.cpp b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash8.cpp
index 696222a95..696222a95 100644
--- a/src/libavoid/tests/lineSegWrapperCrash8.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/lineSegWrapperCrash8.cpp
diff --git a/src/libavoid/tests/msctests/2junctions.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/2junctions.vcxproj
index 9af2c2a0e..9af2c2a0e 100755
--- a/src/libavoid/tests/msctests/2junctions.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/2junctions.vcxproj
diff --git a/src/libavoid/tests/msctests/buildOrthogonalChannelInfo1.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/buildOrthogonalChannelInfo1.vcxproj
index 3caf3c9c6..3caf3c9c6 100755
--- a/src/libavoid/tests/msctests/buildOrthogonalChannelInfo1.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/buildOrthogonalChannelInfo1.vcxproj
diff --git a/src/libavoid/tests/msctests/checkpointNudging1.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/checkpointNudging1.vcxproj
index d248fcf86..d248fcf86 100755
--- a/src/libavoid/tests/msctests/checkpointNudging1.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/checkpointNudging1.vcxproj
diff --git a/src/libavoid/tests/msctests/checkpointNudging2.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/checkpointNudging2.vcxproj
index 04db55a07..04db55a07 100755
--- a/src/libavoid/tests/msctests/checkpointNudging2.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/checkpointNudging2.vcxproj
diff --git a/src/libavoid/tests/msctests/checkpoints01.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/checkpoints01.vcxproj
index a919d2b1b..a919d2b1b 100755
--- a/src/libavoid/tests/msctests/checkpoints01.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/checkpoints01.vcxproj
diff --git a/src/libavoid/tests/msctests/connectionpin01.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/connectionpin01.vcxproj
index 43dfff49b..43dfff49b 100755
--- a/src/libavoid/tests/msctests/connectionpin01.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/connectionpin01.vcxproj
diff --git a/src/libavoid/tests/msctests/connectionpin02.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/connectionpin02.vcxproj
index b2e82b946..b2e82b946 100755
--- a/src/libavoid/tests/msctests/connectionpin02.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/connectionpin02.vcxproj
diff --git a/src/libavoid/tests/msctests/connectionpin03.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/connectionpin03.vcxproj
index 60a30b308..60a30b308 100755
--- a/src/libavoid/tests/msctests/connectionpin03.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/connectionpin03.vcxproj
diff --git a/src/libavoid/tests/msctests/connendmove.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/connendmove.vcxproj
index 92dfc0685..92dfc0685 100755
--- a/src/libavoid/tests/msctests/connendmove.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/connendmove.vcxproj
diff --git a/src/libavoid/tests/msctests/corneroverlap01.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/corneroverlap01.vcxproj
index 4814c4115..4814c4115 100755
--- a/src/libavoid/tests/msctests/corneroverlap01.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/corneroverlap01.vcxproj
diff --git a/src/libavoid/tests/msctests/example.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/example.vcxproj
index f2d9ba780..f2d9ba780 100755
--- a/src/libavoid/tests/msctests/example.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/example.vcxproj
diff --git a/src/libavoid/tests/msctests/finalSegmentNudging1.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/finalSegmentNudging1.vcxproj
index bfc8a87ee..bfc8a87ee 100755
--- a/src/libavoid/tests/msctests/finalSegmentNudging1.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/finalSegmentNudging1.vcxproj
diff --git a/src/libavoid/tests/msctests/finalSegmentNudging2.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/finalSegmentNudging2.vcxproj
index d50324c57..d50324c57 100755
--- a/src/libavoid/tests/msctests/finalSegmentNudging2.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/finalSegmentNudging2.vcxproj
diff --git a/src/libavoid/tests/msctests/finalSegmentNudging3.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/finalSegmentNudging3.vcxproj
index 7877e5e3a..7877e5e3a 100755
--- a/src/libavoid/tests/msctests/finalSegmentNudging3.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/finalSegmentNudging3.vcxproj
diff --git a/src/libavoid/tests/msctests/freeFloatingDirection01.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/freeFloatingDirection01.vcxproj
index f16bfeb40..f16bfeb40 100755
--- a/src/libavoid/tests/msctests/freeFloatingDirection01.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/freeFloatingDirection01.vcxproj
diff --git a/src/libavoid/tests/msctests/junction01.vcxproj b/src/3rdparty/adaptagrams/libavoid/tests/msctests/junction01.vcxproj
index 02f37f9b4..02f37f9b4 100755
--- a/src/libavoid/tests/msctests/junction01.vcxproj
+++ b/src/3rdparty/adaptagrams/libavoid/tests/msctests/junction01.vcxproj
diff --git a/src/libavoid/tests/multiconnact.cpp b/src/3rdparty/adaptagrams/libavoid/tests/multiconnact.cpp
index b5e360d81..b5e360d81 100644
--- a/src/libavoid/tests/multiconnact.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/multiconnact.cpp
diff --git a/src/libavoid/tests/node1.cpp b/src/3rdparty/adaptagrams/libavoid/tests/node1.cpp
index 1da115043..1da115043 100644
--- a/src/libavoid/tests/node1.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/node1.cpp
diff --git a/src/libavoid/tests/nudgeCrossing01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/nudgeCrossing01.cpp
index f5725e52e..f5725e52e 100644
--- a/src/libavoid/tests/nudgeCrossing01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/nudgeCrossing01.cpp
diff --git a/src/libavoid/tests/nudgeintobug.cpp b/src/3rdparty/adaptagrams/libavoid/tests/nudgeintobug.cpp
index cf7f4e90f..cf7f4e90f 100644
--- a/src/libavoid/tests/nudgeintobug.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/nudgeintobug.cpp
diff --git a/src/libavoid/tests/nudgeold.cpp b/src/3rdparty/adaptagrams/libavoid/tests/nudgeold.cpp
index 96bf23732..96bf23732 100644
--- a/src/libavoid/tests/nudgeold.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/nudgeold.cpp
diff --git a/src/libavoid/tests/nudgingSkipsCheckpoint01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/nudgingSkipsCheckpoint01.cpp
index e0c58b50b..e0c58b50b 100644
--- a/src/libavoid/tests/nudgingSkipsCheckpoint01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/nudgingSkipsCheckpoint01.cpp
diff --git a/src/libavoid/tests/nudgingSkipsCheckpoint02.cpp b/src/3rdparty/adaptagrams/libavoid/tests/nudgingSkipsCheckpoint02.cpp
index cb17c82c6..cb17c82c6 100644
--- a/src/libavoid/tests/nudgingSkipsCheckpoint02.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/nudgingSkipsCheckpoint02.cpp
diff --git a/src/libavoid/tests/orderassertion.cpp b/src/3rdparty/adaptagrams/libavoid/tests/orderassertion.cpp
index ad2a5c34d..ad2a5c34d 100644
--- a/src/libavoid/tests/orderassertion.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/orderassertion.cpp
diff --git a/src/libavoid/tests/orthordering01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/orthordering01.cpp
index 30317e688..30317e688 100644
--- a/src/libavoid/tests/orthordering01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/orthordering01.cpp
diff --git a/src/libavoid/tests/orthordering02.cpp b/src/3rdparty/adaptagrams/libavoid/tests/orthordering02.cpp
index 1fec6fad2..1fec6fad2 100644
--- a/src/libavoid/tests/orthordering02.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/orthordering02.cpp
diff --git a/src/libavoid/tests/output/README.txt b/src/3rdparty/adaptagrams/libavoid/tests/output/README.txt
index 1524fa21d..1524fa21d 100644
--- a/src/libavoid/tests/output/README.txt
+++ b/src/3rdparty/adaptagrams/libavoid/tests/output/README.txt
diff --git a/src/libavoid/tests/overlappingRects.cpp b/src/3rdparty/adaptagrams/libavoid/tests/overlappingRects.cpp
index f286285d0..f286285d0 100644
--- a/src/libavoid/tests/overlappingRects.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/overlappingRects.cpp
diff --git a/src/libavoid/tests/penaltyRerouting01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/penaltyRerouting01.cpp
index 4542dfdf6..4542dfdf6 100644
--- a/src/libavoid/tests/penaltyRerouting01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/penaltyRerouting01.cpp
diff --git a/src/libavoid/tests/performance01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/performance01.cpp
index 3735cf563..3735cf563 100644
--- a/src/libavoid/tests/performance01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/performance01.cpp
diff --git a/src/libavoid/tests/reallyslowrouting.cpp b/src/3rdparty/adaptagrams/libavoid/tests/reallyslowrouting.cpp
index 26785d755..26785d755 100644
--- a/src/libavoid/tests/reallyslowrouting.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/reallyslowrouting.cpp
diff --git a/src/libavoid/tests/removeJunctions01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/removeJunctions01.cpp
index ad2768dbc..ad2768dbc 100644
--- a/src/libavoid/tests/removeJunctions01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/removeJunctions01.cpp
diff --git a/src/libavoid/tests/restrictedNudging.cpp b/src/3rdparty/adaptagrams/libavoid/tests/restrictedNudging.cpp
index 77f89609c..77f89609c 100644
--- a/src/libavoid/tests/restrictedNudging.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/restrictedNudging.cpp
diff --git a/src/libavoid/tests/slowrouting.cpp b/src/3rdparty/adaptagrams/libavoid/tests/slowrouting.cpp
index 5a9bf83d1..5a9bf83d1 100644
--- a/src/libavoid/tests/slowrouting.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/slowrouting.cpp
diff --git a/src/libavoid/tests/tjunct.cpp b/src/3rdparty/adaptagrams/libavoid/tests/tjunct.cpp
index 656d0de27..656d0de27 100644
--- a/src/libavoid/tests/tjunct.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/tjunct.cpp
diff --git a/src/libavoid/tests/treeRootCrash01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/treeRootCrash01.cpp
index fc1f0a40c..fc1f0a40c 100644
--- a/src/libavoid/tests/treeRootCrash01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/treeRootCrash01.cpp
diff --git a/src/libavoid/tests/treeRootCrash02.cpp b/src/3rdparty/adaptagrams/libavoid/tests/treeRootCrash02.cpp
index 5f26b3e8d..5f26b3e8d 100644
--- a/src/libavoid/tests/treeRootCrash02.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/treeRootCrash02.cpp
diff --git a/src/libavoid/tests/unsatisfiableRangeAssertion.cpp b/src/3rdparty/adaptagrams/libavoid/tests/unsatisfiableRangeAssertion.cpp
index a69891fce..a69891fce 100644
--- a/src/libavoid/tests/unsatisfiableRangeAssertion.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/unsatisfiableRangeAssertion.cpp
diff --git a/src/libavoid/tests/validPaths01.cpp b/src/3rdparty/adaptagrams/libavoid/tests/validPaths01.cpp
index eb79ee29b..eb79ee29b 100644
--- a/src/libavoid/tests/validPaths01.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/validPaths01.cpp
diff --git a/src/libavoid/tests/validPaths02.cpp b/src/3rdparty/adaptagrams/libavoid/tests/validPaths02.cpp
index 2de3f3b6e..2de3f3b6e 100644
--- a/src/libavoid/tests/validPaths02.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/validPaths02.cpp
diff --git a/src/libavoid/tests/vertlineassertion.cpp b/src/3rdparty/adaptagrams/libavoid/tests/vertlineassertion.cpp
index 2609dd8e4..2609dd8e4 100644
--- a/src/libavoid/tests/vertlineassertion.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/tests/vertlineassertion.cpp
diff --git a/src/libavoid/timer.cpp b/src/3rdparty/adaptagrams/libavoid/timer.cpp
index 142c4ad9f..142c4ad9f 100644
--- a/src/libavoid/timer.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/timer.cpp
diff --git a/src/libavoid/timer.h b/src/3rdparty/adaptagrams/libavoid/timer.h
index 17a07d5e8..17a07d5e8 100644
--- a/src/libavoid/timer.h
+++ b/src/3rdparty/adaptagrams/libavoid/timer.h
diff --git a/src/libavoid/vertices.cpp b/src/3rdparty/adaptagrams/libavoid/vertices.cpp
index 8c2eb0755..8c2eb0755 100644
--- a/src/libavoid/vertices.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/vertices.cpp
diff --git a/src/libavoid/vertices.h b/src/3rdparty/adaptagrams/libavoid/vertices.h
index aac43bb4c..aac43bb4c 100644
--- a/src/libavoid/vertices.h
+++ b/src/3rdparty/adaptagrams/libavoid/vertices.h
diff --git a/src/libavoid/viscluster.cpp b/src/3rdparty/adaptagrams/libavoid/viscluster.cpp
index 922537b4b..922537b4b 100644
--- a/src/libavoid/viscluster.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/viscluster.cpp
diff --git a/src/libavoid/viscluster.h b/src/3rdparty/adaptagrams/libavoid/viscluster.h
index f5ddadc80..f5ddadc80 100644
--- a/src/libavoid/viscluster.h
+++ b/src/3rdparty/adaptagrams/libavoid/viscluster.h
diff --git a/src/libavoid/visibility.cpp b/src/3rdparty/adaptagrams/libavoid/visibility.cpp
index 8f98d575a..8f98d575a 100644
--- a/src/libavoid/visibility.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/visibility.cpp
diff --git a/src/libavoid/visibility.h b/src/3rdparty/adaptagrams/libavoid/visibility.h
index 771d5f5f3..771d5f5f3 100644
--- a/src/libavoid/visibility.h
+++ b/src/3rdparty/adaptagrams/libavoid/visibility.h
diff --git a/src/libavoid/vpsc.cpp b/src/3rdparty/adaptagrams/libavoid/vpsc.cpp
index 294100c91..294100c91 100644
--- a/src/libavoid/vpsc.cpp
+++ b/src/3rdparty/adaptagrams/libavoid/vpsc.cpp
diff --git a/src/libavoid/vpsc.h b/src/3rdparty/adaptagrams/libavoid/vpsc.h
index 52f9bf828..52f9bf828 100644
--- a/src/libavoid/vpsc.h
+++ b/src/3rdparty/adaptagrams/libavoid/vpsc.h
diff --git a/src/libcola/CMakeLists.txt b/src/3rdparty/adaptagrams/libcola/CMakeLists.txt
index 035b32dc2..59bbacc82 100644
--- a/src/libcola/CMakeLists.txt
+++ b/src/3rdparty/adaptagrams/libcola/CMakeLists.txt
@@ -26,4 +26,5 @@ set(libcola_SRC
 	straightener.h
 )
 
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
 add_inkscape_lib(cola_LIB "${libcola_SRC}")
diff --git a/src/libcola/Makefile.am b/src/3rdparty/adaptagrams/libcola/Makefile.am
index e35f7ae18..e35f7ae18 100644
--- a/src/libcola/Makefile.am
+++ b/src/3rdparty/adaptagrams/libcola/Makefile.am
diff --git a/src/libcola/README b/src/3rdparty/adaptagrams/libcola/README
index 03d43be29..03d43be29 100644
--- a/src/libcola/README
+++ b/src/3rdparty/adaptagrams/libcola/README
diff --git a/src/libcola/box.cpp b/src/3rdparty/adaptagrams/libcola/box.cpp
index 8ad3cbaf6..8ad3cbaf6 100644
--- a/src/libcola/box.cpp
+++ b/src/3rdparty/adaptagrams/libcola/box.cpp
diff --git a/src/libcola/box.h b/src/3rdparty/adaptagrams/libcola/box.h
index ff8f0186e..ff8f0186e 100644
--- a/src/libcola/box.h
+++ b/src/3rdparty/adaptagrams/libcola/box.h
diff --git a/src/libcola/cc_clustercontainmentconstraints.cpp b/src/3rdparty/adaptagrams/libcola/cc_clustercontainmentconstraints.cpp
index 93f94eb35..93f94eb35 100644
--- a/src/libcola/cc_clustercontainmentconstraints.cpp
+++ b/src/3rdparty/adaptagrams/libcola/cc_clustercontainmentconstraints.cpp
diff --git a/src/libcola/cc_clustercontainmentconstraints.h b/src/3rdparty/adaptagrams/libcola/cc_clustercontainmentconstraints.h
index 5fbe75eba..5fbe75eba 100644
--- a/src/libcola/cc_clustercontainmentconstraints.h
+++ b/src/3rdparty/adaptagrams/libcola/cc_clustercontainmentconstraints.h
diff --git a/src/libcola/cc_nonoverlapconstraints.cpp b/src/3rdparty/adaptagrams/libcola/cc_nonoverlapconstraints.cpp
index 3911651f5..3911651f5 100644
--- a/src/libcola/cc_nonoverlapconstraints.cpp
+++ b/src/3rdparty/adaptagrams/libcola/cc_nonoverlapconstraints.cpp
diff --git a/src/libcola/cc_nonoverlapconstraints.h b/src/3rdparty/adaptagrams/libcola/cc_nonoverlapconstraints.h
index 04f756da9..04f756da9 100644
--- a/src/libcola/cc_nonoverlapconstraints.h
+++ b/src/3rdparty/adaptagrams/libcola/cc_nonoverlapconstraints.h
diff --git a/src/libcola/cluster.cpp b/src/3rdparty/adaptagrams/libcola/cluster.cpp
index d8b37d7b6..d8b37d7b6 100644
--- a/src/libcola/cluster.cpp
+++ b/src/3rdparty/adaptagrams/libcola/cluster.cpp
diff --git a/src/libcola/cluster.h b/src/3rdparty/adaptagrams/libcola/cluster.h
index 118d703f6..118d703f6 100644
--- a/src/libcola/cluster.h
+++ b/src/3rdparty/adaptagrams/libcola/cluster.h
diff --git a/src/libcola/cola.cpp b/src/3rdparty/adaptagrams/libcola/cola.cpp
index 0009ef894..0009ef894 100644
--- a/src/libcola/cola.cpp
+++ b/src/3rdparty/adaptagrams/libcola/cola.cpp
diff --git a/src/libcola/cola.h b/src/3rdparty/adaptagrams/libcola/cola.h
index 016012134..016012134 100644
--- a/src/libcola/cola.h
+++ b/src/3rdparty/adaptagrams/libcola/cola.h
diff --git a/src/libcola/cola_log.h b/src/3rdparty/adaptagrams/libcola/cola_log.h
index c2c9419c7..c2c9419c7 100644
--- a/src/libcola/cola_log.h
+++ b/src/3rdparty/adaptagrams/libcola/cola_log.h
diff --git a/src/libcola/colafd.cpp b/src/3rdparty/adaptagrams/libcola/colafd.cpp
index 748f3354b..748f3354b 100644
--- a/src/libcola/colafd.cpp
+++ b/src/3rdparty/adaptagrams/libcola/colafd.cpp
diff --git a/src/libcola/commondefs.h b/src/3rdparty/adaptagrams/libcola/commondefs.h
index 591fde57f..591fde57f 100644
--- a/src/libcola/commondefs.h
+++ b/src/3rdparty/adaptagrams/libcola/commondefs.h
diff --git a/src/libcola/compound_constraints.cpp b/src/3rdparty/adaptagrams/libcola/compound_constraints.cpp
index e4552e606..e4552e606 100644
--- a/src/libcola/compound_constraints.cpp
+++ b/src/3rdparty/adaptagrams/libcola/compound_constraints.cpp
diff --git a/src/libcola/compound_constraints.h b/src/3rdparty/adaptagrams/libcola/compound_constraints.h
index 5f62f9edb..5f62f9edb 100644
--- a/src/libcola/compound_constraints.h
+++ b/src/3rdparty/adaptagrams/libcola/compound_constraints.h
diff --git a/src/libcola/conjugate_gradient.cpp b/src/3rdparty/adaptagrams/libcola/conjugate_gradient.cpp
index adb7fa67f..adb7fa67f 100644
--- a/src/libcola/conjugate_gradient.cpp
+++ b/src/3rdparty/adaptagrams/libcola/conjugate_gradient.cpp
diff --git a/src/libcola/conjugate_gradient.h b/src/3rdparty/adaptagrams/libcola/conjugate_gradient.h
index e21cd16d5..e21cd16d5 100644
--- a/src/libcola/conjugate_gradient.h
+++ b/src/3rdparty/adaptagrams/libcola/conjugate_gradient.h
diff --git a/src/libcola/connected_components.cpp b/src/3rdparty/adaptagrams/libcola/connected_components.cpp
index a535e7448..a535e7448 100644
--- a/src/libcola/connected_components.cpp
+++ b/src/3rdparty/adaptagrams/libcola/connected_components.cpp
diff --git a/src/libcola/connected_components.h b/src/3rdparty/adaptagrams/libcola/connected_components.h
index 578eab293..578eab293 100644
--- a/src/libcola/connected_components.h
+++ b/src/3rdparty/adaptagrams/libcola/connected_components.h
diff --git a/src/libcola/convex_hull.cpp b/src/3rdparty/adaptagrams/libcola/convex_hull.cpp
index 3ecbfead4..3ecbfead4 100644
--- a/src/libcola/convex_hull.cpp
+++ b/src/3rdparty/adaptagrams/libcola/convex_hull.cpp
diff --git a/src/libcola/convex_hull.h b/src/3rdparty/adaptagrams/libcola/convex_hull.h
index e17c6a81b..e17c6a81b 100644
--- a/src/libcola/convex_hull.h
+++ b/src/3rdparty/adaptagrams/libcola/convex_hull.h
diff --git a/src/libcola/doc/description.doc b/src/3rdparty/adaptagrams/libcola/doc/description.doc
index 3f11f545f..3f11f545f 100644
--- a/src/libcola/doc/description.doc
+++ b/src/3rdparty/adaptagrams/libcola/doc/description.doc
diff --git a/src/libcola/exceptions.h b/src/3rdparty/adaptagrams/libcola/exceptions.h
index 516e69e10..516e69e10 100644
--- a/src/libcola/exceptions.h
+++ b/src/3rdparty/adaptagrams/libcola/exceptions.h
diff --git a/src/libcola/gradient_projection.cpp b/src/3rdparty/adaptagrams/libcola/gradient_projection.cpp
index 50b8d27d7..50b8d27d7 100644
--- a/src/libcola/gradient_projection.cpp
+++ b/src/3rdparty/adaptagrams/libcola/gradient_projection.cpp
diff --git a/src/libcola/gradient_projection.h b/src/3rdparty/adaptagrams/libcola/gradient_projection.h
index 522748b38..522748b38 100644
--- a/src/libcola/gradient_projection.h
+++ b/src/3rdparty/adaptagrams/libcola/gradient_projection.h
diff --git a/src/libcola/libcola.pc.in b/src/3rdparty/adaptagrams/libcola/libcola.pc.in
index f9d068858..f9d068858 100644
--- a/src/libcola/libcola.pc.in
+++ b/src/3rdparty/adaptagrams/libcola/libcola.pc.in
diff --git a/src/libcola/output_svg.cpp b/src/3rdparty/adaptagrams/libcola/output_svg.cpp
index 4176a5beb..4176a5beb 100644
--- a/src/libcola/output_svg.cpp
+++ b/src/3rdparty/adaptagrams/libcola/output_svg.cpp
diff --git a/src/libcola/output_svg.h b/src/3rdparty/adaptagrams/libcola/output_svg.h
index ae4b1cc69..ae4b1cc69 100644
--- a/src/libcola/output_svg.h
+++ b/src/3rdparty/adaptagrams/libcola/output_svg.h
diff --git a/src/libcola/pseudorandom.cpp b/src/3rdparty/adaptagrams/libcola/pseudorandom.cpp
index 6577b3a05..6577b3a05 100644
--- a/src/libcola/pseudorandom.cpp
+++ b/src/3rdparty/adaptagrams/libcola/pseudorandom.cpp
diff --git a/src/libcola/pseudorandom.h b/src/3rdparty/adaptagrams/libcola/pseudorandom.h
index bb3b2693c..bb3b2693c 100644
--- a/src/libcola/pseudorandom.h
+++ b/src/3rdparty/adaptagrams/libcola/pseudorandom.h
diff --git a/src/libcola/shapepair.cpp b/src/3rdparty/adaptagrams/libcola/shapepair.cpp
index 567332268..567332268 100644
--- a/src/libcola/shapepair.cpp
+++ b/src/3rdparty/adaptagrams/libcola/shapepair.cpp
diff --git a/src/libcola/shapepair.h b/src/3rdparty/adaptagrams/libcola/shapepair.h
index 18b160bc4..18b160bc4 100644
--- a/src/libcola/shapepair.h
+++ b/src/3rdparty/adaptagrams/libcola/shapepair.h
diff --git a/src/libcola/shortest_paths.h b/src/3rdparty/adaptagrams/libcola/shortest_paths.h
index 233624a3e..233624a3e 100644
--- a/src/libcola/shortest_paths.h
+++ b/src/3rdparty/adaptagrams/libcola/shortest_paths.h
diff --git a/src/libcola/sparse_matrix.h b/src/3rdparty/adaptagrams/libcola/sparse_matrix.h
index f4ec85816..f4ec85816 100644
--- a/src/libcola/sparse_matrix.h
+++ b/src/3rdparty/adaptagrams/libcola/sparse_matrix.h
diff --git a/src/libcola/straightener.cpp b/src/3rdparty/adaptagrams/libcola/straightener.cpp
index 8ad30a5ff..8ad30a5ff 100644
--- a/src/libcola/straightener.cpp
+++ b/src/3rdparty/adaptagrams/libcola/straightener.cpp
diff --git a/src/libcola/straightener.h b/src/3rdparty/adaptagrams/libcola/straightener.h
index 7112efcad..7112efcad 100644
--- a/src/libcola/straightener.h
+++ b/src/3rdparty/adaptagrams/libcola/straightener.h
diff --git a/src/libcola/tests/FixedRelativeConstraint01.cpp b/src/3rdparty/adaptagrams/libcola/tests/FixedRelativeConstraint01.cpp
index 50c34842e..50c34842e 100755
--- a/src/libcola/tests/FixedRelativeConstraint01.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/FixedRelativeConstraint01.cpp
diff --git a/src/libcola/tests/Makefile.am b/src/3rdparty/adaptagrams/libcola/tests/Makefile.am
index a73ff8247..a73ff8247 100644
--- a/src/libcola/tests/Makefile.am
+++ b/src/3rdparty/adaptagrams/libcola/tests/Makefile.am
diff --git a/src/libcola/tests/StillOverlap01.cpp b/src/3rdparty/adaptagrams/libcola/tests/StillOverlap01.cpp
index d277627c2..d277627c2 100755
--- a/src/libcola/tests/StillOverlap01.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/StillOverlap01.cpp
diff --git a/src/libcola/tests/StillOverlap02.cpp b/src/3rdparty/adaptagrams/libcola/tests/StillOverlap02.cpp
index 47b9958b0..47b9958b0 100755
--- a/src/libcola/tests/StillOverlap02.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/StillOverlap02.cpp
diff --git a/src/libcola/tests/boundary.cpp b/src/3rdparty/adaptagrams/libcola/tests/boundary.cpp
index 18522e1cf..18522e1cf 100644
--- a/src/libcola/tests/boundary.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/boundary.cpp
diff --git a/src/libcola/tests/connected_components.cpp b/src/3rdparty/adaptagrams/libcola/tests/connected_components.cpp
index d5df479e7..d5df479e7 100644
--- a/src/libcola/tests/connected_components.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/connected_components.cpp
diff --git a/src/libcola/tests/constrained.cpp b/src/3rdparty/adaptagrams/libcola/tests/constrained.cpp
index 550601131..550601131 100644
--- a/src/libcola/tests/constrained.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/constrained.cpp
diff --git a/src/libcola/tests/containment.cpp b/src/3rdparty/adaptagrams/libcola/tests/containment.cpp
index 0783b45cf..0783b45cf 100644
--- a/src/libcola/tests/containment.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/containment.cpp
diff --git a/src/libcola/tests/containment2.cpp b/src/3rdparty/adaptagrams/libcola/tests/containment2.cpp
index d411431b2..d411431b2 100644
--- a/src/libcola/tests/containment2.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/containment2.cpp
diff --git a/src/libcola/tests/convex_hull.cpp b/src/3rdparty/adaptagrams/libcola/tests/convex_hull.cpp
index 23ebbfb4a..23ebbfb4a 100644
--- a/src/libcola/tests/convex_hull.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/convex_hull.cpp
diff --git a/src/libcola/tests/cycle_detector.cpp b/src/3rdparty/adaptagrams/libcola/tests/cycle_detector.cpp
index 4f4fefb7e..4f4fefb7e 100644
--- a/src/libcola/tests/cycle_detector.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/cycle_detector.cpp
diff --git a/src/libcola/tests/data/1138_bus.txt b/src/3rdparty/adaptagrams/libcola/tests/data/1138_bus.txt
index fb63ec309..fb63ec309 100644
--- a/src/libcola/tests/data/1138_bus.txt
+++ b/src/3rdparty/adaptagrams/libcola/tests/data/1138_bus.txt
diff --git a/src/libcola/tests/data/uetzNetworkGSC-all.gml b/src/3rdparty/adaptagrams/libcola/tests/data/uetzNetworkGSC-all.gml
index 99c40536c..99c40536c 100644
--- a/src/libcola/tests/data/uetzNetworkGSC-all.gml
+++ b/src/3rdparty/adaptagrams/libcola/tests/data/uetzNetworkGSC-all.gml
diff --git a/src/libcola/tests/gml_graph.cpp b/src/3rdparty/adaptagrams/libcola/tests/gml_graph.cpp
index 03ad8cca4..03ad8cca4 100644
--- a/src/libcola/tests/gml_graph.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/gml_graph.cpp
diff --git a/src/libcola/tests/graphlayouttest.h b/src/3rdparty/adaptagrams/libcola/tests/graphlayouttest.h
index 58715bab6..58715bab6 100644
--- a/src/libcola/tests/graphlayouttest.h
+++ b/src/3rdparty/adaptagrams/libcola/tests/graphlayouttest.h
diff --git a/src/libcola/tests/initialOverlap.cpp b/src/3rdparty/adaptagrams/libcola/tests/initialOverlap.cpp
index ba871990f..ba871990f 100644
--- a/src/libcola/tests/initialOverlap.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/initialOverlap.cpp
diff --git a/src/libcola/tests/invalid.cpp b/src/3rdparty/adaptagrams/libcola/tests/invalid.cpp
index 175a6b7a5..175a6b7a5 100644
--- a/src/libcola/tests/invalid.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/invalid.cpp
diff --git a/src/libcola/tests/large_graph.cpp b/src/3rdparty/adaptagrams/libcola/tests/large_graph.cpp
index 712bd692c..712bd692c 100644
--- a/src/libcola/tests/large_graph.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/large_graph.cpp
diff --git a/src/libcola/tests/makefeasible.cpp b/src/3rdparty/adaptagrams/libcola/tests/makefeasible.cpp
index a67936de8..a67936de8 100644
--- a/src/libcola/tests/makefeasible.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/makefeasible.cpp
diff --git a/src/libcola/tests/makefeasible02.cpp b/src/3rdparty/adaptagrams/libcola/tests/makefeasible02.cpp
index 2c4da9a1f..2c4da9a1f 100755
--- a/src/libcola/tests/makefeasible02.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/makefeasible02.cpp
diff --git a/src/libcola/tests/makemovie.sh b/src/3rdparty/adaptagrams/libcola/tests/makemovie.sh
index cd571f969..cd571f969 100644
--- a/src/libcola/tests/makemovie.sh
+++ b/src/3rdparty/adaptagrams/libcola/tests/makemovie.sh
diff --git a/src/libcola/tests/max_acyclic_subgraph.cpp b/src/3rdparty/adaptagrams/libcola/tests/max_acyclic_subgraph.cpp
index 9e9b1d44e..9e9b1d44e 100644
--- a/src/libcola/tests/max_acyclic_subgraph.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/max_acyclic_subgraph.cpp
diff --git a/src/libcola/tests/overlappingClusters01.cpp b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters01.cpp
index 7a00be676..7a00be676 100644
--- a/src/libcola/tests/overlappingClusters01.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters01.cpp
diff --git a/src/libcola/tests/overlappingClusters02.cpp b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters02.cpp
index d721e9409..d721e9409 100644
--- a/src/libcola/tests/overlappingClusters02.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters02.cpp
diff --git a/src/libcola/tests/overlappingClusters04.cpp b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters04.cpp
index 36a85bd19..36a85bd19 100644
--- a/src/libcola/tests/overlappingClusters04.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/overlappingClusters04.cpp
diff --git a/src/libcola/tests/page_bounds.cpp b/src/3rdparty/adaptagrams/libcola/tests/page_bounds.cpp
index 212036477..212036477 100644
--- a/src/libcola/tests/page_bounds.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/page_bounds.cpp
diff --git a/src/libcola/tests/planar.cpp b/src/3rdparty/adaptagrams/libcola/tests/planar.cpp
index 19deb8718..19deb8718 100644
--- a/src/libcola/tests/planar.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/planar.cpp
diff --git a/src/libcola/tests/random_graph.cpp b/src/3rdparty/adaptagrams/libcola/tests/random_graph.cpp
index 215e704cc..215e704cc 100644
--- a/src/libcola/tests/random_graph.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/random_graph.cpp
diff --git a/src/libcola/tests/rectangularClusters01.cpp b/src/3rdparty/adaptagrams/libcola/tests/rectangularClusters01.cpp
index 087617abf..087617abf 100644
--- a/src/libcola/tests/rectangularClusters01.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/rectangularClusters01.cpp
diff --git a/src/libcola/tests/rectclustershapecontainment.cpp b/src/3rdparty/adaptagrams/libcola/tests/rectclustershapecontainment.cpp
index 013c6343a..013c6343a 100644
--- a/src/libcola/tests/rectclustershapecontainment.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/rectclustershapecontainment.cpp
diff --git a/src/libcola/tests/resize.cpp b/src/3rdparty/adaptagrams/libcola/tests/resize.cpp
index cf43bfac8..cf43bfac8 100644
--- a/src/libcola/tests/resize.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/resize.cpp
diff --git a/src/libcola/tests/runtest.sh b/src/3rdparty/adaptagrams/libcola/tests/runtest.sh
index 2ee152609..2ee152609 100755
--- a/src/libcola/tests/runtest.sh
+++ b/src/3rdparty/adaptagrams/libcola/tests/runtest.sh
diff --git a/src/libcola/tests/scale_free.cpp b/src/3rdparty/adaptagrams/libcola/tests/scale_free.cpp
index d9c2934e7..d9c2934e7 100644
--- a/src/libcola/tests/scale_free.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/scale_free.cpp
diff --git a/src/libcola/tests/shortest_paths.cpp b/src/3rdparty/adaptagrams/libcola/tests/shortest_paths.cpp
index 617f13673..617f13673 100644
--- a/src/libcola/tests/shortest_paths.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/shortest_paths.cpp
diff --git a/src/libcola/tests/small_graph.cpp b/src/3rdparty/adaptagrams/libcola/tests/small_graph.cpp
index 116eb5ecf..116eb5ecf 100644
--- a/src/libcola/tests/small_graph.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/small_graph.cpp
diff --git a/src/libcola/tests/sparse_matrix.cpp b/src/3rdparty/adaptagrams/libcola/tests/sparse_matrix.cpp
index 099fcf376..099fcf376 100644
--- a/src/libcola/tests/sparse_matrix.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/sparse_matrix.cpp
diff --git a/src/libcola/tests/test_cg.cpp b/src/3rdparty/adaptagrams/libcola/tests/test_cg.cpp
index 13e7d0202..13e7d0202 100644
--- a/src/libcola/tests/test_cg.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/test_cg.cpp
diff --git a/src/libcola/tests/topology.cpp b/src/3rdparty/adaptagrams/libcola/tests/topology.cpp
index c9ac63730..c9ac63730 100644
--- a/src/libcola/tests/topology.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/topology.cpp
diff --git a/src/libcola/tests/trees.cpp b/src/3rdparty/adaptagrams/libcola/tests/trees.cpp
index 7824af867..7824af867 100644
--- a/src/libcola/tests/trees.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/trees.cpp
diff --git a/src/libcola/tests/unconstrained.cpp b/src/3rdparty/adaptagrams/libcola/tests/unconstrained.cpp
index df614ae68..df614ae68 100644
--- a/src/libcola/tests/unconstrained.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/unconstrained.cpp
diff --git a/src/libcola/tests/unsatisfiable.cpp b/src/3rdparty/adaptagrams/libcola/tests/unsatisfiable.cpp
index 4e768f7db..4e768f7db 100644
--- a/src/libcola/tests/unsatisfiable.cpp
+++ b/src/3rdparty/adaptagrams/libcola/tests/unsatisfiable.cpp
diff --git a/src/libcola/tests/view_cd_output.sh b/src/3rdparty/adaptagrams/libcola/tests/view_cd_output.sh
index cb74ae88e..cb74ae88e 100755
--- a/src/libcola/tests/view_cd_output.sh
+++ b/src/3rdparty/adaptagrams/libcola/tests/view_cd_output.sh
diff --git a/src/libcola/tests/view_mas_output.sh b/src/3rdparty/adaptagrams/libcola/tests/view_mas_output.sh
index 11f5a8a93..11f5a8a93 100755
--- a/src/libcola/tests/view_mas_output.sh
+++ b/src/3rdparty/adaptagrams/libcola/tests/view_mas_output.sh
diff --git a/src/libcola/unused.h b/src/3rdparty/adaptagrams/libcola/unused.h
index 1e519fe46..1e519fe46 100644
--- a/src/libcola/unused.h
+++ b/src/3rdparty/adaptagrams/libcola/unused.h
diff --git a/src/libvpsc/CMakeLists.txt b/src/3rdparty/adaptagrams/libvpsc/CMakeLists.txt
index 60fed84ea..fabf64740 100644
--- a/src/libvpsc/CMakeLists.txt
+++ b/src/3rdparty/adaptagrams/libvpsc/CMakeLists.txt
@@ -25,4 +25,5 @@ set(libvpsc_SRC
 	variable.h
 )
 
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
 add_inkscape_lib(vpsc_LIB "${libvpsc_SRC}")
diff --git a/src/libvpsc/COPYING b/src/3rdparty/adaptagrams/libvpsc/COPYING
index 6ff1d7b6f..6ff1d7b6f 100644
--- a/src/libvpsc/COPYING
+++ b/src/3rdparty/adaptagrams/libvpsc/COPYING
diff --git a/src/libvpsc/Makefile.am b/src/3rdparty/adaptagrams/libvpsc/Makefile.am
index 12e779aa8..12e779aa8 100644
--- a/src/libvpsc/Makefile.am
+++ b/src/3rdparty/adaptagrams/libvpsc/Makefile.am
diff --git a/src/libvpsc/README b/src/3rdparty/adaptagrams/libvpsc/README
index 03d43be29..03d43be29 100644
--- a/src/libvpsc/README
+++ b/src/3rdparty/adaptagrams/libvpsc/README
diff --git a/src/libvpsc/assertions.h b/src/3rdparty/adaptagrams/libvpsc/assertions.h
index 68eab8f11..68eab8f11 100644
--- a/src/libvpsc/assertions.h
+++ b/src/3rdparty/adaptagrams/libvpsc/assertions.h
diff --git a/src/libvpsc/block.cpp b/src/3rdparty/adaptagrams/libvpsc/block.cpp
index a5e7ed0d1..a5e7ed0d1 100644
--- a/src/libvpsc/block.cpp
+++ b/src/3rdparty/adaptagrams/libvpsc/block.cpp
diff --git a/src/libvpsc/block.h b/src/3rdparty/adaptagrams/libvpsc/block.h
index 21a3737b7..21a3737b7 100644
--- a/src/libvpsc/block.h
+++ b/src/3rdparty/adaptagrams/libvpsc/block.h
diff --git a/src/libvpsc/blocks.cpp b/src/3rdparty/adaptagrams/libvpsc/blocks.cpp
index 52e940ce7..52e940ce7 100644
--- a/src/libvpsc/blocks.cpp
+++ b/src/3rdparty/adaptagrams/libvpsc/blocks.cpp
diff --git a/src/libvpsc/blocks.h b/src/3rdparty/adaptagrams/libvpsc/blocks.h
index a3613db2f..a3613db2f 100644
--- a/src/libvpsc/blocks.h
+++ b/src/3rdparty/adaptagrams/libvpsc/blocks.h
diff --git a/src/libvpsc/cbuffer.cpp b/src/3rdparty/adaptagrams/libvpsc/cbuffer.cpp
index 676bad304..676bad304 100644
--- a/src/libvpsc/cbuffer.cpp
+++ b/src/3rdparty/adaptagrams/libvpsc/cbuffer.cpp
diff --git a/src/libvpsc/cbuffer.h b/src/3rdparty/adaptagrams/libvpsc/cbuffer.h
index 9cf302cbf..9cf302cbf 100644
--- a/src/libvpsc/cbuffer.h
+++ b/src/3rdparty/adaptagrams/libvpsc/cbuffer.h
diff --git a/src/libvpsc/constraint.cpp b/src/3rdparty/adaptagrams/libvpsc/constraint.cpp
index f1b7f0571..f1b7f0571 100644
--- a/src/libvpsc/constraint.cpp
+++ b/src/3rdparty/adaptagrams/libvpsc/constraint.cpp
diff --git a/src/libvpsc/constraint.h b/src/3rdparty/adaptagrams/libvpsc/constraint.h
index 271a2cfce..271a2cfce 100644
--- a/src/libvpsc/constraint.h
+++ b/src/3rdparty/adaptagrams/libvpsc/constraint.h
diff --git a/src/libvpsc/doc/description.doc b/src/3rdparty/adaptagrams/libvpsc/doc/description.doc
index 46a21b093..46a21b093 100644
--- a/src/libvpsc/doc/description.doc
+++ b/src/3rdparty/adaptagrams/libvpsc/doc/description.doc
diff --git a/src/libvpsc/exceptions.h b/src/3rdparty/adaptagrams/libvpsc/exceptions.h
index 5f66afe26..5f66afe26 100644
--- a/src/libvpsc/exceptions.h
+++ b/src/3rdparty/adaptagrams/libvpsc/exceptions.h
diff --git a/src/libvpsc/isnan.h b/src/3rdparty/adaptagrams/libvpsc/isnan.h
index 1e32b8a7a..1e32b8a7a 100644
--- a/src/libvpsc/isnan.h
+++ b/src/3rdparty/adaptagrams/libvpsc/isnan.h
diff --git a/src/libvpsc/libvpsc.pc.in b/src/3rdparty/adaptagrams/libvpsc/libvpsc.pc.in
index 9b6ff52ba..9b6ff52ba 100644
--- a/src/libvpsc/libvpsc.pc.in
+++ b/src/3rdparty/adaptagrams/libvpsc/libvpsc.pc.in
diff --git a/src/libvpsc/linesegment.h b/src/3rdparty/adaptagrams/libvpsc/linesegment.h
index ecf8800b0..ecf8800b0 100644
--- a/src/libvpsc/linesegment.h
+++ b/src/3rdparty/adaptagrams/libvpsc/linesegment.h
diff --git a/src/libvpsc/pairing_heap.h b/src/3rdparty/adaptagrams/libvpsc/pairing_heap.h
index 6e6457c07..6e6457c07 100644
--- a/src/libvpsc/pairing_heap.h
+++ b/src/3rdparty/adaptagrams/libvpsc/pairing_heap.h
diff --git a/src/libvpsc/rectangle.cpp b/src/3rdparty/adaptagrams/libvpsc/rectangle.cpp
index f040f4427..f040f4427 100644
--- a/src/libvpsc/rectangle.cpp
+++ b/src/3rdparty/adaptagrams/libvpsc/rectangle.cpp
diff --git a/src/libvpsc/rectangle.h b/src/3rdparty/adaptagrams/libvpsc/rectangle.h
index df7639933..df7639933 100644
--- a/src/libvpsc/rectangle.h
+++ b/src/3rdparty/adaptagrams/libvpsc/rectangle.h
diff --git a/src/libvpsc/solve_VPSC.cpp b/src/3rdparty/adaptagrams/libvpsc/solve_VPSC.cpp
index aebd0b8d8..aebd0b8d8 100644
--- a/src/libvpsc/solve_VPSC.cpp
+++ b/src/3rdparty/adaptagrams/libvpsc/solve_VPSC.cpp
diff --git a/src/libvpsc/solve_VPSC.h b/src/3rdparty/adaptagrams/libvpsc/solve_VPSC.h
index 5f7713c12..5f7713c12 100644
--- a/src/libvpsc/solve_VPSC.h
+++ b/src/3rdparty/adaptagrams/libvpsc/solve_VPSC.h
diff --git a/src/libvpsc/tests/Makefile.am b/src/3rdparty/adaptagrams/libvpsc/tests/Makefile.am
index d155c5260..d155c5260 100644
--- a/src/libvpsc/tests/Makefile.am
+++ b/src/3rdparty/adaptagrams/libvpsc/tests/Makefile.am
diff --git a/src/libvpsc/tests/block.cpp b/src/3rdparty/adaptagrams/libvpsc/tests/block.cpp
index 08080e957..08080e957 100644
--- a/src/libvpsc/tests/block.cpp
+++ b/src/3rdparty/adaptagrams/libvpsc/tests/block.cpp
diff --git a/src/libvpsc/tests/cycle.cpp b/src/3rdparty/adaptagrams/libvpsc/tests/cycle.cpp
index 26dda3a0c..26dda3a0c 100644
--- a/src/libvpsc/tests/cycle.cpp
+++ b/src/3rdparty/adaptagrams/libvpsc/tests/cycle.cpp
diff --git a/src/libvpsc/tests/rectangleoverlap.cpp b/src/3rdparty/adaptagrams/libvpsc/tests/rectangleoverlap.cpp
index d4fba2b1b..d4fba2b1b 100644
--- a/src/libvpsc/tests/rectangleoverlap.cpp
+++ b/src/3rdparty/adaptagrams/libvpsc/tests/rectangleoverlap.cpp
diff --git a/src/libvpsc/tests/satisfy_inc.cpp b/src/3rdparty/adaptagrams/libvpsc/tests/satisfy_inc.cpp
index 514b36e2f..514b36e2f 100644
--- a/src/libvpsc/tests/satisfy_inc.cpp
+++ b/src/3rdparty/adaptagrams/libvpsc/tests/satisfy_inc.cpp
diff --git a/src/libvpsc/variable.cpp b/src/3rdparty/adaptagrams/libvpsc/variable.cpp
index 4466c6823..4466c6823 100644
--- a/src/libvpsc/variable.cpp
+++ b/src/3rdparty/adaptagrams/libvpsc/variable.cpp
diff --git a/src/libvpsc/variable.h b/src/3rdparty/adaptagrams/libvpsc/variable.h
index d6114eee6..d6114eee6 100644
--- a/src/libvpsc/variable.h
+++ b/src/3rdparty/adaptagrams/libvpsc/variable.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6135288ad..a776e001e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -276,11 +276,7 @@ add_subdirectory(3rdparty)
 add_subdirectory(inkgc)
 add_subdirectory(livarot)
 add_subdirectory(libnrtype)
-
-#these are independent from inkscape and should be packaged as a separate project.
-add_subdirectory(libcola)
-add_subdirectory(libavoid)
-add_subdirectory(libvpsc)
+include_directories("3rdparty/adaptagrams")
 
 get_property(inkscape_global_SRC GLOBAL PROPERTY inkscape_global_SRC)
 
diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index 34fe27cd5..c7254a449 100644
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
@@ -27,8 +27,8 @@
 
 #include "display/curve.h"
 
-#include "libavoid/router.h"
-#include "libavoid/shape.h"
+#include "3rdparty/adaptagrams/libavoid/router.h"
+#include "3rdparty/adaptagrams/libavoid/shape.h"
 
 #include "object/sp-namedview.h"
 #include "object/sp-shape.h"
diff --git a/src/document.cpp b/src/document.cpp
index eaaa318e9..d8b5ee38e 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -58,7 +58,7 @@
 
 #include "display/drawing.h"
 
-#include "libavoid/router.h"
+#include "3rdparty/adaptagrams/libavoid/router.h"
 
 #include "3rdparty/libcroco/cr-parser.h"
 #include "3rdparty/libcroco/cr-sel-eng.h"
diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index 31115b999..437c147ca 100644
--- a/src/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -25,10 +25,10 @@
 #include "graphlayout.h"
 #include "inkscape.h"
 
-#include "libavoid/router.h"
+#include "3rdparty/adaptagrams/libavoid/router.h"
 
-#include "libcola/cola.h"
-#include "libcola/connected_components.h"
+#include "3rdparty/adaptagrams/libcola/cola.h"
+#include "3rdparty/adaptagrams/libcola/connected_components.h"
 
 #include "object/sp-item-transform.h"
 #include "object/sp-namedview.h"
diff --git a/src/object/sp-conn-end-pair.cpp b/src/object/sp-conn-end-pair.cpp
index 1a0ec5d70..b810df315 100644
--- a/src/object/sp-conn-end-pair.cpp
+++ b/src/object/sp-conn-end-pair.cpp
@@ -21,7 +21,7 @@
 #include "display/curve.h"
 #include "xml/repr.h"
 #include "sp-path.h"
-#include "libavoid/router.h"
+#include "3rdparty/adaptagrams/libavoid/router.h"
 #include "document.h"
 #include "sp-item-group.h"
 
diff --git a/src/object/sp-conn-end-pair.h b/src/object/sp-conn-end-pair.h
index a1ee4f885..167003026 100644
--- a/src/object/sp-conn-end-pair.h
+++ b/src/object/sp-conn-end-pair.h
@@ -15,7 +15,7 @@
 #include <cstddef>
 #include <sigc++/sigc++.h>
 
-#include "libavoid/connector.h"
+#include "3rdparty/adaptagrams/libavoid/connector.h"
 
 
 class SPConnEnd;
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 20b309a98..c1175f592 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -89,7 +89,7 @@
 #include "display/curve.h"
 #include "display/sp-canvas.h"
 
-#include "libavoid/router.h"
+#include "3rdparty/adaptagrams/libavoid/router.h"
 
 #include "object/sp-conn-end.h"
 #include "object/sp-flowtext.h"