Merge pull request #96 from GordonSmith/trunk

feat: Bump versions
hpcc-systems · Feb 27, 2022 · 149fb90 · 149fb90
2 parents 8bab8b5 + f85a87c
commit 149fb90
Show file tree

Hide file tree

Showing 32 changed files with 795 additions and 809 deletions.
diff --git a/README.md b/README.md
@@ -3,11 +3,11 @@
 ![Test PR](https://github.com/hpcc-systems/hpcc-js-wasm/workflows/Test%20PR/badge.svg)
 
 This repository contains a collection of useful c++ libraries compiled to WASM for (re)use in Node JS, Web Browsers and JavaScript Libraries:
-* [graphviz](https://www.graphviz.org/) - v2.50.0
-* [expat](https://libexpat.github.io/) - v2.4.1
+* [graphviz](https://www.graphviz.org/) - v3.0.0
+* [expat](https://libexpat.github.io/) - v2.4.6
 
 Built with:
-* [emsdk](https://github.com/emscripten-core/emsdk) - v3.0.0
+* [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.6
 
 ## Quick GraphViz Demos
 * https://raw.githack.com/hpcc-systems/hpcc-js-wasm/trunk/index.html

diff --git a/cpp/graphviz/graphvizlib/CMakeLists.txt b/cpp/graphviz/graphvizlib/CMakeLists.txt
@@ -37,6 +37,7 @@ TARGET_LINK_LIBRARIES(graphvizlib
     gvplugin_dot_layout
     gvplugin_neato_layout
     common
+    label
     ortho
     pack
 )
@@ -52,6 +53,7 @@ TARGET_LINK_LIBRARIES(graphvizlib.node
     gvplugin_dot_layout
     gvplugin_neato_layout
     common
+    label
     ortho
     pack
 )

diff --git a/cpp/graphviz/lib/CMakeLists.txt b/cpp/graphviz/lib/CMakeLists.txt
@@ -20,7 +20,6 @@ add_subdirectory(pathplan)
 add_subdirectory(rbtree)
 add_subdirectory(sparse)
 add_subdirectory(sfdpgen)
-#add_subdirectory(spine)
 #add_subdirectory(topfish)
 add_subdirectory(twopigen)
 #add_subdirectory(vmalloc)

diff --git a/cpp/graphviz/lib/cdt/CMakeLists.txt b/cpp/graphviz/lib/cdt/CMakeLists.txt
@@ -1,29 +1,28 @@
 
 add_library(cdt STATIC
-    # Header files
-    ${GRAPHVIZ_LIB_DIR}/cdt/cdt.h
-    ${GRAPHVIZ_LIB_DIR}/cdt/dthdr.h
+  # Header files
+  ${GRAPHVIZ_LIB_DIR}/cdt/cdt.h
+  ${GRAPHVIZ_LIB_DIR}/cdt/dthdr.h
 
-    # Source files
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtclose.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtdisc.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtextract.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtflatten.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dthash.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtlist.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtmethod.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtopen.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtrenew.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtrestore.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtsize.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtstat.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtstrhash.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dttree.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtview.c
-    ${GRAPHVIZ_LIB_DIR}/cdt/dtwalk.c
+  # Source files
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtclose.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtdisc.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtextract.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtflatten.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dthash.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtlist.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtmethod.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtopen.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtrenew.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtrestore.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtsize.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtstat.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtstrhash.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dttree.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtview.c
+  ${GRAPHVIZ_LIB_DIR}/cdt/dtwalk.c
 )
 
 target_include_directories(cdt PRIVATE
-    ${GRAPHVIZ_LIB_DIR}
-    ${GRAPHVIZ_LIB_DIR}/cdt
-)
+  ${GRAPHVIZ_LIB_DIR}
+  ${GRAPHVIZ_LIB_DIR}/cdt)
diff --git a/cpp/graphviz/lib/cgraph/CMakeLists.txt b/cpp/graphviz/lib/cgraph/CMakeLists.txt
@@ -1,46 +1,49 @@
 
 add_library(cgraph STATIC
-    # Header files
-    ${GRAPHVIZ_LIB_DIR}/cgraph/agxbuf.h
-    ${GRAPHVIZ_LIB_DIR}/cgraph/cghdr.h
-    ${GRAPHVIZ_LIB_DIR}/cgraph/cgraph.h
-    ${GRAPHVIZ_LIB_DIR}/cgraph/itos.h
-    ${GRAPHVIZ_LIB_DIR}/cgraph/likely.h
-    ${GRAPHVIZ_LIB_DIR}/cgraph/sprint.h
-    ${GRAPHVIZ_LIB_DIR}/cgraph/strcasecmp.h
-    ${GRAPHVIZ_LIB_DIR}/cgraph/unreachable.h
+  # Header files
+  ${GRAPHVIZ_LIB_DIR}/cgraph/agxbuf.h
+  ${GRAPHVIZ_LIB_DIR}/cgraph/bitarray.h
+  ${GRAPHVIZ_LIB_DIR}/cgraph/cghdr.h
+  ${GRAPHVIZ_LIB_DIR}/cgraph/cgraph.h
+  ${GRAPHVIZ_LIB_DIR}/cgraph/exit.h
+  ${GRAPHVIZ_LIB_DIR}/cgraph/itos.h
+  ${GRAPHVIZ_LIB_DIR}/cgraph/likely.h
+  ${GRAPHVIZ_LIB_DIR}/cgraph/prisize_t.h
+  ${GRAPHVIZ_LIB_DIR}/cgraph/sprint.h
+  ${GRAPHVIZ_LIB_DIR}/cgraph/strcasecmp.h
+  ${GRAPHVIZ_LIB_DIR}/cgraph/unreachable.h
 
-    # Source files
-    ${GRAPHVIZ_LIB_DIR}/cgraph/agerror.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/agxbuf.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/apply.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/attr.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/edge.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/flatten.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/graph.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/id.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/imap.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/io.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/mem.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/node.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/obj.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/pend.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/rec.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/refstr.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/subg.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/utils.c
-    ${GRAPHVIZ_LIB_DIR}/cgraph/write.c
+  # Source files
+  ${GRAPHVIZ_LIB_DIR}/cgraph/agerror.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/agxbuf.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/apply.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/attr.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/edge.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/flatten.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/graph.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/id.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/imap.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/io.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/mem.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/node.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/obj.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/pend.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/rec.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/refstr.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/subg.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/utils.c
+  ${GRAPHVIZ_LIB_DIR}/cgraph/write.c
 
-    # Generated files
-    ${GRAPHVIZ_BUILD_DIR}/lib/cgraph/grammar.c
-    ${GRAPHVIZ_BUILD_DIR}/lib/cgraph/scan.c
+  # Generated files
+  ${GRAPHVIZ_BUILD_DIR}/lib/cgraph/grammar.c
+  ${GRAPHVIZ_BUILD_DIR}/lib/cgraph/scan.c
 )
 
 target_include_directories(cgraph PRIVATE
-    ${GRAPHVIZ_LIB_DIR}
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_BUILD_DIR}/lib/cgraph
+  ${GRAPHVIZ_LIB_DIR}
+  ${GRAPHVIZ_LIB_DIR}/cdt
+  ${GRAPHVIZ_LIB_DIR}/cgraph
+  ${GRAPHVIZ_BUILD_DIR}/lib/cgraph
 )
 
 target_link_libraries(cgraph cdt)

diff --git a/cpp/graphviz/lib/circogen/CMakeLists.txt b/cpp/graphviz/lib/circogen/CMakeLists.txt
@@ -1,35 +1,32 @@
 add_library(circogen STATIC
-    # Header files
-    ${GRAPHVIZ_LIB_DIR}/circogen/block.h
-    ${GRAPHVIZ_LIB_DIR}/circogen/blockpath.h
-    ${GRAPHVIZ_LIB_DIR}/circogen/blocktree.h
-    ${GRAPHVIZ_LIB_DIR}/circogen/circo.h
-    ${GRAPHVIZ_LIB_DIR}/circogen/circpos.h
-    ${GRAPHVIZ_LIB_DIR}/circogen/circular.h
-    ${GRAPHVIZ_LIB_DIR}/circogen/deglist.h
-    ${GRAPHVIZ_LIB_DIR}/circogen/edgelist.h
-    ${GRAPHVIZ_LIB_DIR}/circogen/nodelist.h
-    ${GRAPHVIZ_LIB_DIR}/circogen/nodeset.h
+  # Header files
+  ${GRAPHVIZ_LIB_DIR}/circogen/block.h
+  ${GRAPHVIZ_LIB_DIR}/circogen/blockpath.h
+  ${GRAPHVIZ_LIB_DIR}/circogen/blocktree.h
+  ${GRAPHVIZ_LIB_DIR}/circogen/circo.h
+  ${GRAPHVIZ_LIB_DIR}/circogen/circpos.h
+  ${GRAPHVIZ_LIB_DIR}/circogen/circular.h
+  ${GRAPHVIZ_LIB_DIR}/circogen/deglist.h
+  ${GRAPHVIZ_LIB_DIR}/circogen/edgelist.h
+  ${GRAPHVIZ_LIB_DIR}/circogen/nodelist.h
 
-    # Source files
-    ${GRAPHVIZ_LIB_DIR}/circogen/block.c
-    ${GRAPHVIZ_LIB_DIR}/circogen/blockpath.c
-    ${GRAPHVIZ_LIB_DIR}/circogen/blocktree.c
-    ${GRAPHVIZ_LIB_DIR}/circogen/circpos.c
-    ${GRAPHVIZ_LIB_DIR}/circogen/circular.c
-    ${GRAPHVIZ_LIB_DIR}/circogen/circularinit.c
-    ${GRAPHVIZ_LIB_DIR}/circogen/deglist.c
-    ${GRAPHVIZ_LIB_DIR}/circogen/edgelist.c
-    ${GRAPHVIZ_LIB_DIR}/circogen/nodelist.c
-    ${GRAPHVIZ_LIB_DIR}/circogen/nodeset.c
+  # Source files
+  ${GRAPHVIZ_LIB_DIR}/circogen/block.c
+  ${GRAPHVIZ_LIB_DIR}/circogen/blockpath.c
+  ${GRAPHVIZ_LIB_DIR}/circogen/blocktree.c
+  ${GRAPHVIZ_LIB_DIR}/circogen/circpos.c
+  ${GRAPHVIZ_LIB_DIR}/circogen/circular.c
+  ${GRAPHVIZ_LIB_DIR}/circogen/circularinit.c
+  ${GRAPHVIZ_LIB_DIR}/circogen/deglist.c
+  ${GRAPHVIZ_LIB_DIR}/circogen/edgelist.c
+  ${GRAPHVIZ_LIB_DIR}/circogen/nodelist.c
 )
 
 target_include_directories(circogen PRIVATE
-    ${GRAPHVIZ_LIB_DIR}
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_LIB_DIR}/common
-    ${GRAPHVIZ_LIB_DIR}/gvc
-    ${GRAPHVIZ_LIB_DIR}/pack
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-)
+  ${GRAPHVIZ_LIB_DIR}
+  ${GRAPHVIZ_LIB_DIR}/cdt
+  ${GRAPHVIZ_LIB_DIR}/cgraph
+  ${GRAPHVIZ_LIB_DIR}/common
+  ${GRAPHVIZ_LIB_DIR}/gvc
+  ${GRAPHVIZ_LIB_DIR}/pack
+  ${GRAPHVIZ_LIB_DIR}/pathplan)
diff --git a/cpp/graphviz/lib/common/CMakeLists.txt b/cpp/graphviz/lib/common/CMakeLists.txt
@@ -1,74 +1,74 @@
 PROJECT(common)
 
 add_library(common STATIC
-    # Header files
-    ${GRAPHVIZ_LIB_DIR}/common/arith.h
-    ${GRAPHVIZ_LIB_DIR}/common/color.h
-    ${GRAPHVIZ_LIB_DIR}/common/colorprocs.h
-    ${GRAPHVIZ_BUILD_DIR}/lib/common/common/colortbl.h
-    ${GRAPHVIZ_LIB_DIR}/common/const.h
-    ${GRAPHVIZ_LIB_DIR}/common/entities.h
-    ${GRAPHVIZ_LIB_DIR}/common/geom.h
-    ${GRAPHVIZ_LIB_DIR}/common/geomprocs.h
-    ${GRAPHVIZ_LIB_DIR}/common/globals.h
-    ${GRAPHVIZ_LIB_DIR}/common/intset.h
-    ${GRAPHVIZ_LIB_DIR}/common/htmllex.h
-    ${GRAPHVIZ_LIB_DIR}/common/htmltable.h
-    ${GRAPHVIZ_LIB_DIR}/common/logic.h
-    ${GRAPHVIZ_LIB_DIR}/common/macros.h
-    ${GRAPHVIZ_LIB_DIR}/common/memory.h
-    ${GRAPHVIZ_LIB_DIR}/common/pointset.h
-    ${GRAPHVIZ_LIB_DIR}/common/ps_font_equiv.h
-    ${GRAPHVIZ_LIB_DIR}/common/render.h
-    ${GRAPHVIZ_LIB_DIR}/common/textspan.h
-    ${GRAPHVIZ_LIB_DIR}/common/textspan_lut.h
-    ${GRAPHVIZ_LIB_DIR}/common/types.h
-    ${GRAPHVIZ_LIB_DIR}/common/usershape.h
-    ${GRAPHVIZ_LIB_DIR}/common/utils.h
+  # Header files
+  ${GRAPHVIZ_LIB_DIR}/common/arith.h
+  ${GRAPHVIZ_LIB_DIR}/common/color.h
+  ${GRAPHVIZ_LIB_DIR}/common/colorprocs.h
+  ${GRAPHVIZ_BUILD_DIR}/lib/common/common/colortbl.h
+  ${GRAPHVIZ_LIB_DIR}/common/const.h
+  ${GRAPHVIZ_LIB_DIR}/common/entities.h
+  ${GRAPHVIZ_LIB_DIR}/common/geom.h
+  ${GRAPHVIZ_LIB_DIR}/common/geomprocs.h
+  ${GRAPHVIZ_LIB_DIR}/common/globals.h
+  ${GRAPHVIZ_LIB_DIR}/common/intset.h
+  ${GRAPHVIZ_LIB_DIR}/common/htmllex.h
+  ${GRAPHVIZ_LIB_DIR}/common/htmltable.h
+  ${GRAPHVIZ_LIB_DIR}/common/logic.h
+  ${GRAPHVIZ_LIB_DIR}/common/macros.h
+  ${GRAPHVIZ_LIB_DIR}/common/memory.h
+  ${GRAPHVIZ_LIB_DIR}/common/pointset.h
+  ${GRAPHVIZ_LIB_DIR}/common/ps_font_equiv.h
+  ${GRAPHVIZ_LIB_DIR}/common/render.h
+  ${GRAPHVIZ_LIB_DIR}/common/textspan.h
+  ${GRAPHVIZ_LIB_DIR}/common/textspan_lut.h
+  ${GRAPHVIZ_LIB_DIR}/common/types.h
+  ${GRAPHVIZ_LIB_DIR}/common/usershape.h
+  ${GRAPHVIZ_LIB_DIR}/common/utils.h
 
-    # Source files
-    ${GRAPHVIZ_LIB_DIR}/common/args.c
-    ${GRAPHVIZ_LIB_DIR}/common/arrows.c
-    ${GRAPHVIZ_LIB_DIR}/common/colxlate.c
-    ${GRAPHVIZ_LIB_DIR}/common/ellipse.c
-    ${GRAPHVIZ_LIB_DIR}/common/emit.c
-    ${GRAPHVIZ_LIB_DIR}/common/geom.c
-    ${GRAPHVIZ_LIB_DIR}/common/globals.c
-    ${GRAPHVIZ_LIB_DIR}/common/htmllex.c
-    ${GRAPHVIZ_LIB_DIR}/common/htmltable.c
-    ${GRAPHVIZ_LIB_DIR}/common/input.c
-    ${GRAPHVIZ_LIB_DIR}/common/intset.c
-    ${GRAPHVIZ_LIB_DIR}/common/labels.c
-    ${GRAPHVIZ_LIB_DIR}/common/ns.c
-    ${GRAPHVIZ_LIB_DIR}/common/memory.c
-    ${GRAPHVIZ_LIB_DIR}/common/output.c
-    ${GRAPHVIZ_LIB_DIR}/common/pointset.c
-    ${GRAPHVIZ_LIB_DIR}/common/postproc.c
-    ${GRAPHVIZ_LIB_DIR}/common/psusershape.c
-    ${GRAPHVIZ_LIB_DIR}/common/routespl.c
-    ${GRAPHVIZ_LIB_DIR}/common/shapes.c
-    ${GRAPHVIZ_LIB_DIR}/common/splines.c
-    ${GRAPHVIZ_LIB_DIR}/common/taper.c
-    ${GRAPHVIZ_LIB_DIR}/common/textspan.c
-    ${GRAPHVIZ_LIB_DIR}/common/textspan_lut.c
-    ${GRAPHVIZ_LIB_DIR}/common/timing.c
-    ${GRAPHVIZ_LIB_DIR}/common/utils.c
-    ${GRAPHVIZ_LIB_DIR}/common/xml.c
+  # Source files
+  ${GRAPHVIZ_LIB_DIR}/common/args.c
+  ${GRAPHVIZ_LIB_DIR}/common/arrows.c
+  ${GRAPHVIZ_LIB_DIR}/common/colxlate.c
+  ${GRAPHVIZ_LIB_DIR}/common/ellipse.c
+  ${GRAPHVIZ_LIB_DIR}/common/emit.c
+  ${GRAPHVIZ_LIB_DIR}/common/geom.c
+  ${GRAPHVIZ_LIB_DIR}/common/globals.c
+  ${GRAPHVIZ_LIB_DIR}/common/htmllex.c
+  ${GRAPHVIZ_LIB_DIR}/common/htmltable.c
+  ${GRAPHVIZ_LIB_DIR}/common/input.c
+  ${GRAPHVIZ_LIB_DIR}/common/intset.c
+  ${GRAPHVIZ_LIB_DIR}/common/labels.c
+  ${GRAPHVIZ_LIB_DIR}/common/ns.c
+  ${GRAPHVIZ_LIB_DIR}/common/memory.c
+  ${GRAPHVIZ_LIB_DIR}/common/output.c
+  ${GRAPHVIZ_LIB_DIR}/common/pointset.c
+  ${GRAPHVIZ_LIB_DIR}/common/postproc.c
+  ${GRAPHVIZ_LIB_DIR}/common/psusershape.c
+  ${GRAPHVIZ_LIB_DIR}/common/routespl.c
+  ${GRAPHVIZ_LIB_DIR}/common/shapes.c
+  ${GRAPHVIZ_LIB_DIR}/common/splines.c
+  ${GRAPHVIZ_LIB_DIR}/common/taper.c
+  ${GRAPHVIZ_LIB_DIR}/common/textspan.c
+  ${GRAPHVIZ_LIB_DIR}/common/textspan_lut.c
+  ${GRAPHVIZ_LIB_DIR}/common/timing.c
+  ${GRAPHVIZ_LIB_DIR}/common/utils.c
+  ${GRAPHVIZ_LIB_DIR}/common/xml.c
 
-    # Generated files
-    ${GRAPHVIZ_BUILD_DIR}/lib/common/htmlparse.c
+  # Generated files
+  ${GRAPHVIZ_BUILD_DIR}/lib/common/htmlparse.c
 )
 
 target_include_directories(common PRIVATE
-    ${GRAPHVIZ_LIB_DIR}
-    ${GRAPHVIZ_LIB_DIR}/common
-    ${GRAPHVIZ_BUILD_DIR}/lib/common
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_LIB_DIR}/gvc
-    ${GRAPHVIZ_LIB_DIR}/pack
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GRAPHVIZ_LIB_DIR}/xdot
-    ${EXPAT_DIR}/lib
+  ${GRAPHVIZ_LIB_DIR}
+  ${GRAPHVIZ_LIB_DIR}/common
+  ${GRAPHVIZ_BUILD_DIR}/lib/common
+  ${GRAPHVIZ_LIB_DIR}/cdt
+  ${GRAPHVIZ_LIB_DIR}/cgraph
+  ${GRAPHVIZ_LIB_DIR}/gvc
+  ${GRAPHVIZ_LIB_DIR}/pack
+  ${GRAPHVIZ_LIB_DIR}/pathplan
+  ${GRAPHVIZ_LIB_DIR}/xdot
+  ${EXPAT_DIR}/lib
 )