diff --git a/README.md b/README.md index 0a348eea..ead471d1 100644 --- 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 index 970ed030..4847a097 100644 --- 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 index 93702aef..b7e752d6 100644 --- 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 index e08ea296..10a129be 100644 --- 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 index b23c70be..652dbbbc 100644 --- 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 index 5490c113..fb73dfda 100644 --- 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 index 3b6dc12d..8ed59213 100644 --- 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 ) diff --git a/cpp/graphviz/lib/dotgen/CMakeLists.txt b/cpp/graphviz/lib/dotgen/CMakeLists.txt index 735e9afb..2a90012d 100644 --- a/cpp/graphviz/lib/dotgen/CMakeLists.txt +++ b/cpp/graphviz/lib/dotgen/CMakeLists.txt @@ -1,35 +1,35 @@ add_library(dotgen STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/dotgen/aspect.h - ${GRAPHVIZ_LIB_DIR}/dotgen/dot.h - ${GRAPHVIZ_LIB_DIR}/dotgen/dotprocs.h + # Header files + ${GRAPHVIZ_LIB_DIR}/dotgen/aspect.h + ${GRAPHVIZ_LIB_DIR}/dotgen/dot.h + ${GRAPHVIZ_LIB_DIR}/dotgen/dotprocs.h - # Source files - ${GRAPHVIZ_LIB_DIR}/dotgen/aspect.c - ${GRAPHVIZ_LIB_DIR}/dotgen/acyclic.c - ${GRAPHVIZ_LIB_DIR}/dotgen/class1.c - ${GRAPHVIZ_LIB_DIR}/dotgen/class2.c - ${GRAPHVIZ_LIB_DIR}/dotgen/cluster.c - ${GRAPHVIZ_LIB_DIR}/dotgen/compound.c - ${GRAPHVIZ_LIB_DIR}/dotgen/conc.c - ${GRAPHVIZ_LIB_DIR}/dotgen/decomp.c - ${GRAPHVIZ_LIB_DIR}/dotgen/dotinit.c - ${GRAPHVIZ_LIB_DIR}/dotgen/dotsplines.c - ${GRAPHVIZ_LIB_DIR}/dotgen/fastgr.c - ${GRAPHVIZ_LIB_DIR}/dotgen/flat.c - ${GRAPHVIZ_LIB_DIR}/dotgen/mincross.c - ${GRAPHVIZ_LIB_DIR}/dotgen/position.c - ${GRAPHVIZ_LIB_DIR}/dotgen/rank.c - ${GRAPHVIZ_LIB_DIR}/dotgen/sameport.c + # Source files + ${GRAPHVIZ_LIB_DIR}/dotgen/aspect.c + ${GRAPHVIZ_LIB_DIR}/dotgen/acyclic.c + ${GRAPHVIZ_LIB_DIR}/dotgen/class1.c + ${GRAPHVIZ_LIB_DIR}/dotgen/class2.c + ${GRAPHVIZ_LIB_DIR}/dotgen/cluster.c + ${GRAPHVIZ_LIB_DIR}/dotgen/compound.c + ${GRAPHVIZ_LIB_DIR}/dotgen/conc.c + ${GRAPHVIZ_LIB_DIR}/dotgen/decomp.c + ${GRAPHVIZ_LIB_DIR}/dotgen/dotinit.c + ${GRAPHVIZ_LIB_DIR}/dotgen/dotsplines.c + ${GRAPHVIZ_LIB_DIR}/dotgen/fastgr.c + ${GRAPHVIZ_LIB_DIR}/dotgen/flat.c + ${GRAPHVIZ_LIB_DIR}/dotgen/mincross.c + ${GRAPHVIZ_LIB_DIR}/dotgen/position.c + ${GRAPHVIZ_LIB_DIR}/dotgen/rank.c + ${GRAPHVIZ_LIB_DIR}/dotgen/sameport.c ) target_include_directories(dotgen 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/fdpgen/CMakeLists.txt b/cpp/graphviz/lib/fdpgen/CMakeLists.txt index 2da0bfc1..fff0fe5f 100644 --- a/cpp/graphviz/lib/fdpgen/CMakeLists.txt +++ b/cpp/graphviz/lib/fdpgen/CMakeLists.txt @@ -1,30 +1,30 @@ add_library(fdpgen STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/fdpgen/clusteredges.h - ${GRAPHVIZ_LIB_DIR}/fdpgen/comp.h - ${GRAPHVIZ_LIB_DIR}/fdpgen/dbg.h - ${GRAPHVIZ_LIB_DIR}/fdpgen/fdp.h - ${GRAPHVIZ_LIB_DIR}/fdpgen/grid.h - ${GRAPHVIZ_LIB_DIR}/fdpgen/tlayout.h - ${GRAPHVIZ_LIB_DIR}/fdpgen/xlayout.h + # Header files + ${GRAPHVIZ_LIB_DIR}/fdpgen/clusteredges.h + ${GRAPHVIZ_LIB_DIR}/fdpgen/comp.h + ${GRAPHVIZ_LIB_DIR}/fdpgen/dbg.h + ${GRAPHVIZ_LIB_DIR}/fdpgen/fdp.h + ${GRAPHVIZ_LIB_DIR}/fdpgen/grid.h + ${GRAPHVIZ_LIB_DIR}/fdpgen/tlayout.h + ${GRAPHVIZ_LIB_DIR}/fdpgen/xlayout.h - # Source files - ${GRAPHVIZ_LIB_DIR}/fdpgen/clusteredges.c - ${GRAPHVIZ_LIB_DIR}/fdpgen/comp.c - ${GRAPHVIZ_LIB_DIR}/fdpgen/dbg.c - ${GRAPHVIZ_LIB_DIR}/fdpgen/fdpinit.c - ${GRAPHVIZ_LIB_DIR}/fdpgen/grid.c - ${GRAPHVIZ_LIB_DIR}/fdpgen/layout.c - ${GRAPHVIZ_LIB_DIR}/fdpgen/tlayout.c - ${GRAPHVIZ_LIB_DIR}/fdpgen/xlayout.c + # Source files + ${GRAPHVIZ_LIB_DIR}/fdpgen/clusteredges.c + ${GRAPHVIZ_LIB_DIR}/fdpgen/comp.c + ${GRAPHVIZ_LIB_DIR}/fdpgen/dbg.c + ${GRAPHVIZ_LIB_DIR}/fdpgen/fdpinit.c + ${GRAPHVIZ_LIB_DIR}/fdpgen/grid.c + ${GRAPHVIZ_LIB_DIR}/fdpgen/layout.c + ${GRAPHVIZ_LIB_DIR}/fdpgen/tlayout.c + ${GRAPHVIZ_LIB_DIR}/fdpgen/xlayout.c ) target_include_directories(fdpgen 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/gvc/CMakeLists.txt b/cpp/graphviz/lib/gvc/CMakeLists.txt index d4ce83a3..f758320c 100644 --- a/cpp/graphviz/lib/gvc/CMakeLists.txt +++ b/cpp/graphviz/lib/gvc/CMakeLists.txt @@ -1,41 +1,41 @@ add_library(gvc STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/gvc/gvc.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvcext.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvcint.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvcjob.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvconfig.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvcommon.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvcproc.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvio.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin_device.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin_layout.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin_loadimage.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin_render.h - ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin_textlayout.h + # Header files + ${GRAPHVIZ_LIB_DIR}/gvc/gvc.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvcext.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvcint.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvcjob.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvconfig.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvcommon.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvcproc.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvio.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin_device.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin_layout.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin_loadimage.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin_render.h + ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin_textlayout.h - # Source files - ${GRAPHVIZ_LIB_DIR}/gvc/gvc.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvconfig.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvcontext.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvdevice.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvevent.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvjobs.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvlayout.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvloadimage.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvrender.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvtextlayout.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvtool_tred.c - ${GRAPHVIZ_LIB_DIR}/gvc/gvusershape.c + # Source files + ${GRAPHVIZ_LIB_DIR}/gvc/gvc.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvconfig.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvcontext.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvdevice.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvevent.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvjobs.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvlayout.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvloadimage.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvplugin.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvrender.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvtextlayout.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvtool_tred.c + ${GRAPHVIZ_LIB_DIR}/gvc/gvusershape.c ) -target_include_directories(gvc PRIVATE +target_include_directories(gvc + PUBLIC ${GRAPHVIZ_LIB_DIR} ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_BUILD_DIR} - ${GRAPHVIZ_LIB_DIR}/ast ${GRAPHVIZ_LIB_DIR}/cdt ${GRAPHVIZ_LIB_DIR}/cgraph ${GRAPHVIZ_LIB_DIR}/common @@ -43,11 +43,11 @@ target_include_directories(gvc PRIVATE ) target_link_libraries(gvc - cdt - cgraph - label - pack - pathplan - xdot - expat + cdt + cgraph + common + pack + pathplan + xdot + expat ) diff --git a/cpp/graphviz/lib/ingraphs/CMakeLists.txt b/cpp/graphviz/lib/ingraphs/CMakeLists.txt index 5441aaee..7de7dce4 100644 --- a/cpp/graphviz/lib/ingraphs/CMakeLists.txt +++ b/cpp/graphviz/lib/ingraphs/CMakeLists.txt @@ -1,13 +1,13 @@ add_library(ingraphs STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/ingraphs/ingraphs.h + # Header files + ${GRAPHVIZ_LIB_DIR}/ingraphs/ingraphs.h - # Source files - ${GRAPHVIZ_LIB_DIR}/ingraphs/ingraphs.c + # Source files + ${GRAPHVIZ_LIB_DIR}/ingraphs/ingraphs.c ) target_include_directories(ingraphs PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR} + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph ) diff --git a/cpp/graphviz/lib/label/CMakeLists.txt b/cpp/graphviz/lib/label/CMakeLists.txt index 66e1edc6..24562063 100644 --- a/cpp/graphviz/lib/label/CMakeLists.txt +++ b/cpp/graphviz/lib/label/CMakeLists.txt @@ -1,22 +1,22 @@ add_library(label STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/label/index.h - ${GRAPHVIZ_LIB_DIR}/label/node.h - ${GRAPHVIZ_LIB_DIR}/label/rectangle.h - ${GRAPHVIZ_LIB_DIR}/label/split.q.h - ${GRAPHVIZ_LIB_DIR}/label/xlabels.h + # Header files + ${GRAPHVIZ_LIB_DIR}/label/index.h + ${GRAPHVIZ_LIB_DIR}/label/node.h + ${GRAPHVIZ_LIB_DIR}/label/rectangle.h + ${GRAPHVIZ_LIB_DIR}/label/split.q.h + ${GRAPHVIZ_LIB_DIR}/label/xlabels.h - # Source files - ${GRAPHVIZ_LIB_DIR}/label/index.c - ${GRAPHVIZ_LIB_DIR}/label/node.c - ${GRAPHVIZ_LIB_DIR}/label/rectangle.c - ${GRAPHVIZ_LIB_DIR}/label/split.q.c - ${GRAPHVIZ_LIB_DIR}/label/xlabels.c + # Source files + ${GRAPHVIZ_LIB_DIR}/label/index.c + ${GRAPHVIZ_LIB_DIR}/label/node.c + ${GRAPHVIZ_LIB_DIR}/label/rectangle.c + ${GRAPHVIZ_LIB_DIR}/label/split.q.c + ${GRAPHVIZ_LIB_DIR}/label/xlabels.c ) target_include_directories(label PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR} + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common ) diff --git a/cpp/graphviz/lib/neatogen/CMakeLists.txt b/cpp/graphviz/lib/neatogen/CMakeLists.txt index 7abfa8ba..0f8b7f47 100644 --- a/cpp/graphviz/lib/neatogen/CMakeLists.txt +++ b/cpp/graphviz/lib/neatogen/CMakeLists.txt @@ -1,98 +1,98 @@ set(sources - # Header files - ${GRAPHVIZ_LIB_DIR}/neatogen/adjust.h - ${GRAPHVIZ_LIB_DIR}/neatogen/bfs.h - ${GRAPHVIZ_LIB_DIR}/neatogen/call_tri.h - ${GRAPHVIZ_LIB_DIR}/neatogen/closest.h - ${GRAPHVIZ_LIB_DIR}/neatogen/conjgrad.h - ${GRAPHVIZ_LIB_DIR}/neatogen/defs.h - ${GRAPHVIZ_LIB_DIR}/neatogen/delaunay.h - ${GRAPHVIZ_LIB_DIR}/neatogen/digcola.h - ${GRAPHVIZ_LIB_DIR}/neatogen/dijkstra.h - ${GRAPHVIZ_LIB_DIR}/neatogen/edges.h - ${GRAPHVIZ_LIB_DIR}/neatogen/embed_graph.h - ${GRAPHVIZ_LIB_DIR}/neatogen/fPQ.h - ${GRAPHVIZ_LIB_DIR}/neatogen/geometry.h - ${GRAPHVIZ_LIB_DIR}/neatogen/heap.h - ${GRAPHVIZ_LIB_DIR}/neatogen/hedges.h - ${GRAPHVIZ_LIB_DIR}/neatogen/info.h - ${GRAPHVIZ_LIB_DIR}/neatogen/kkutils.h - ${GRAPHVIZ_LIB_DIR}/neatogen/matrix_ops.h - ${GRAPHVIZ_LIB_DIR}/neatogen/mem.h - ${GRAPHVIZ_LIB_DIR}/neatogen/multispline.h - ${GRAPHVIZ_LIB_DIR}/neatogen/neato.h - ${GRAPHVIZ_LIB_DIR}/neatogen/neatoprocs.h - ${GRAPHVIZ_LIB_DIR}/neatogen/overlap.h - ${GRAPHVIZ_LIB_DIR}/neatogen/pca.h - ${GRAPHVIZ_LIB_DIR}/neatogen/poly.h - ${GRAPHVIZ_LIB_DIR}/neatogen/quad_prog_solver.h - ${GRAPHVIZ_LIB_DIR}/neatogen/quad_prog_vpsc.h - ${GRAPHVIZ_LIB_DIR}/neatogen/site.h - ${GRAPHVIZ_LIB_DIR}/neatogen/sparsegraph.h - ${GRAPHVIZ_LIB_DIR}/neatogen/stress.h - ${GRAPHVIZ_LIB_DIR}/neatogen/voronoi.h - ${GRAPHVIZ_LIB_DIR}/neatogen/sgd.h - ${GRAPHVIZ_LIB_DIR}/neatogen/randomkit.h + # Header files + ${GRAPHVIZ_LIB_DIR}/neatogen/adjust.h + ${GRAPHVIZ_LIB_DIR}/neatogen/bfs.h + ${GRAPHVIZ_LIB_DIR}/neatogen/call_tri.h + ${GRAPHVIZ_LIB_DIR}/neatogen/closest.h + ${GRAPHVIZ_LIB_DIR}/neatogen/conjgrad.h + ${GRAPHVIZ_LIB_DIR}/neatogen/defs.h + ${GRAPHVIZ_LIB_DIR}/neatogen/delaunay.h + ${GRAPHVIZ_LIB_DIR}/neatogen/digcola.h + ${GRAPHVIZ_LIB_DIR}/neatogen/dijkstra.h + ${GRAPHVIZ_LIB_DIR}/neatogen/edges.h + ${GRAPHVIZ_LIB_DIR}/neatogen/embed_graph.h + ${GRAPHVIZ_LIB_DIR}/neatogen/fPQ.h + ${GRAPHVIZ_LIB_DIR}/neatogen/geometry.h + ${GRAPHVIZ_LIB_DIR}/neatogen/heap.h + ${GRAPHVIZ_LIB_DIR}/neatogen/hedges.h + ${GRAPHVIZ_LIB_DIR}/neatogen/info.h + ${GRAPHVIZ_LIB_DIR}/neatogen/kkutils.h + ${GRAPHVIZ_LIB_DIR}/neatogen/matrix_ops.h + ${GRAPHVIZ_LIB_DIR}/neatogen/mem.h + ${GRAPHVIZ_LIB_DIR}/neatogen/multispline.h + ${GRAPHVIZ_LIB_DIR}/neatogen/neato.h + ${GRAPHVIZ_LIB_DIR}/neatogen/neatoprocs.h + ${GRAPHVIZ_LIB_DIR}/neatogen/overlap.h + ${GRAPHVIZ_LIB_DIR}/neatogen/pca.h + ${GRAPHVIZ_LIB_DIR}/neatogen/poly.h + ${GRAPHVIZ_LIB_DIR}/neatogen/quad_prog_solver.h + ${GRAPHVIZ_LIB_DIR}/neatogen/quad_prog_vpsc.h + ${GRAPHVIZ_LIB_DIR}/neatogen/site.h + ${GRAPHVIZ_LIB_DIR}/neatogen/sparsegraph.h + ${GRAPHVIZ_LIB_DIR}/neatogen/stress.h + ${GRAPHVIZ_LIB_DIR}/neatogen/voronoi.h + ${GRAPHVIZ_LIB_DIR}/neatogen/sgd.h + ${GRAPHVIZ_LIB_DIR}/neatogen/randomkit.h - # Source files - ${GRAPHVIZ_LIB_DIR}/neatogen/adjust.c - ${GRAPHVIZ_LIB_DIR}/neatogen/bfs.c - ${GRAPHVIZ_LIB_DIR}/neatogen/call_tri.c - ${GRAPHVIZ_LIB_DIR}/neatogen/circuit.c - ${GRAPHVIZ_LIB_DIR}/neatogen/closest.c - ${GRAPHVIZ_LIB_DIR}/neatogen/compute_hierarchy.c - ${GRAPHVIZ_LIB_DIR}/neatogen/conjgrad.c - ${GRAPHVIZ_LIB_DIR}/neatogen/constrained_majorization.c - ${GRAPHVIZ_LIB_DIR}/neatogen/constraint.c - ${GRAPHVIZ_LIB_DIR}/neatogen/delaunay.c - ${GRAPHVIZ_LIB_DIR}/neatogen/dijkstra.c - ${GRAPHVIZ_LIB_DIR}/neatogen/edges.c - ${GRAPHVIZ_LIB_DIR}/neatogen/embed_graph.c - ${GRAPHVIZ_LIB_DIR}/neatogen/geometry.c - ${GRAPHVIZ_LIB_DIR}/neatogen/heap.c - ${GRAPHVIZ_LIB_DIR}/neatogen/hedges.c - ${GRAPHVIZ_LIB_DIR}/neatogen/info.c - ${GRAPHVIZ_LIB_DIR}/neatogen/kkutils.c - ${GRAPHVIZ_LIB_DIR}/neatogen/legal.c - ${GRAPHVIZ_LIB_DIR}/neatogen/lu.c - ${GRAPHVIZ_LIB_DIR}/neatogen/matinv.c - ${GRAPHVIZ_LIB_DIR}/neatogen/matrix_ops.c - ${GRAPHVIZ_LIB_DIR}/neatogen/memory.c - ${GRAPHVIZ_LIB_DIR}/neatogen/multispline.c - ${GRAPHVIZ_LIB_DIR}/neatogen/neatoinit.c - ${GRAPHVIZ_LIB_DIR}/neatogen/neatosplines.c - ${GRAPHVIZ_LIB_DIR}/neatogen/opt_arrangement.c - ${GRAPHVIZ_LIB_DIR}/neatogen/overlap.c - ${GRAPHVIZ_LIB_DIR}/neatogen/pca.c - ${GRAPHVIZ_LIB_DIR}/neatogen/poly.c - ${GRAPHVIZ_LIB_DIR}/neatogen/printvis.c - ${GRAPHVIZ_LIB_DIR}/neatogen/quad_prog_solve.c - ${GRAPHVIZ_LIB_DIR}/neatogen/site.c - ${GRAPHVIZ_LIB_DIR}/neatogen/smart_ini_x.c - ${GRAPHVIZ_LIB_DIR}/neatogen/solve.c - ${GRAPHVIZ_LIB_DIR}/neatogen/stuff.c - ${GRAPHVIZ_LIB_DIR}/neatogen/stress.c - ${GRAPHVIZ_LIB_DIR}/neatogen/voronoi.c - ${GRAPHVIZ_LIB_DIR}/neatogen/sgd.c - ${GRAPHVIZ_LIB_DIR}/neatogen/randomkit.c + # Source files + ${GRAPHVIZ_LIB_DIR}/neatogen/adjust.c + ${GRAPHVIZ_LIB_DIR}/neatogen/bfs.c + ${GRAPHVIZ_LIB_DIR}/neatogen/call_tri.c + ${GRAPHVIZ_LIB_DIR}/neatogen/circuit.c + ${GRAPHVIZ_LIB_DIR}/neatogen/closest.c + ${GRAPHVIZ_LIB_DIR}/neatogen/compute_hierarchy.c + ${GRAPHVIZ_LIB_DIR}/neatogen/conjgrad.c + ${GRAPHVIZ_LIB_DIR}/neatogen/constrained_majorization.c + ${GRAPHVIZ_LIB_DIR}/neatogen/constraint.c + ${GRAPHVIZ_LIB_DIR}/neatogen/delaunay.c + ${GRAPHVIZ_LIB_DIR}/neatogen/dijkstra.c + ${GRAPHVIZ_LIB_DIR}/neatogen/edges.c + ${GRAPHVIZ_LIB_DIR}/neatogen/embed_graph.c + ${GRAPHVIZ_LIB_DIR}/neatogen/geometry.c + ${GRAPHVIZ_LIB_DIR}/neatogen/heap.c + ${GRAPHVIZ_LIB_DIR}/neatogen/hedges.c + ${GRAPHVIZ_LIB_DIR}/neatogen/info.c + ${GRAPHVIZ_LIB_DIR}/neatogen/kkutils.c + ${GRAPHVIZ_LIB_DIR}/neatogen/legal.c + ${GRAPHVIZ_LIB_DIR}/neatogen/lu.c + ${GRAPHVIZ_LIB_DIR}/neatogen/matinv.c + ${GRAPHVIZ_LIB_DIR}/neatogen/matrix_ops.c + ${GRAPHVIZ_LIB_DIR}/neatogen/memory.c + ${GRAPHVIZ_LIB_DIR}/neatogen/multispline.c + ${GRAPHVIZ_LIB_DIR}/neatogen/neatoinit.c + ${GRAPHVIZ_LIB_DIR}/neatogen/neatosplines.c + ${GRAPHVIZ_LIB_DIR}/neatogen/opt_arrangement.c + ${GRAPHVIZ_LIB_DIR}/neatogen/overlap.c + ${GRAPHVIZ_LIB_DIR}/neatogen/pca.c + ${GRAPHVIZ_LIB_DIR}/neatogen/poly.c + ${GRAPHVIZ_LIB_DIR}/neatogen/printvis.c + ${GRAPHVIZ_LIB_DIR}/neatogen/quad_prog_solve.c + ${GRAPHVIZ_LIB_DIR}/neatogen/site.c + ${GRAPHVIZ_LIB_DIR}/neatogen/smart_ini_x.c + ${GRAPHVIZ_LIB_DIR}/neatogen/solve.c + ${GRAPHVIZ_LIB_DIR}/neatogen/stuff.c + ${GRAPHVIZ_LIB_DIR}/neatogen/stress.c + ${GRAPHVIZ_LIB_DIR}/neatogen/voronoi.c + ${GRAPHVIZ_LIB_DIR}/neatogen/sgd.c + ${GRAPHVIZ_LIB_DIR}/neatogen/randomkit.c - # with_ipsepcola - ${GRAPHVIZ_LIB_DIR}/neatogen/constrained_majorization_ipsep.c - ${GRAPHVIZ_LIB_DIR}/neatogen/mosek_quad_solve.c - ${GRAPHVIZ_LIB_DIR}/neatogen/mosek_quad_solve.h - ${GRAPHVIZ_LIB_DIR}/neatogen/quad_prog_vpsc.c + # with_ipsepcola + ${GRAPHVIZ_LIB_DIR}/neatogen/constrained_majorization_ipsep.c + ${GRAPHVIZ_LIB_DIR}/neatogen/mosek_quad_solve.c + ${GRAPHVIZ_LIB_DIR}/neatogen/mosek_quad_solve.h + ${GRAPHVIZ_LIB_DIR}/neatogen/quad_prog_vpsc.c ) add_library(neatogen STATIC - ${sources} + ${sources} ) target_include_directories(neatogen 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/ortho/CMakeLists.txt b/cpp/graphviz/lib/ortho/CMakeLists.txt index 8770b237..0745985a 100644 --- a/cpp/graphviz/lib/ortho/CMakeLists.txt +++ b/cpp/graphviz/lib/ortho/CMakeLists.txt @@ -1,33 +1,33 @@ add_definitions(-D_BLD_gvc=1) add_library(ortho STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/ortho/fPQ.h - ${GRAPHVIZ_LIB_DIR}/ortho/maze.h - ${GRAPHVIZ_LIB_DIR}/ortho/ortho.h - ${GRAPHVIZ_LIB_DIR}/ortho/partition.h - ${GRAPHVIZ_LIB_DIR}/ortho/rawgraph.h - ${GRAPHVIZ_LIB_DIR}/ortho/sgraph.h - ${GRAPHVIZ_LIB_DIR}/ortho/structures.h - ${GRAPHVIZ_LIB_DIR}/ortho/trap.h + # Header files + ${GRAPHVIZ_LIB_DIR}/ortho/fPQ.h + ${GRAPHVIZ_LIB_DIR}/ortho/maze.h + ${GRAPHVIZ_LIB_DIR}/ortho/ortho.h + ${GRAPHVIZ_LIB_DIR}/ortho/partition.h + ${GRAPHVIZ_LIB_DIR}/ortho/rawgraph.h + ${GRAPHVIZ_LIB_DIR}/ortho/sgraph.h + ${GRAPHVIZ_LIB_DIR}/ortho/structures.h + ${GRAPHVIZ_LIB_DIR}/ortho/trap.h - # Source files - ${GRAPHVIZ_LIB_DIR}/ortho/fPQ.c - ${GRAPHVIZ_LIB_DIR}/ortho/maze.c - ${GRAPHVIZ_LIB_DIR}/ortho/ortho.c - ${GRAPHVIZ_LIB_DIR}/ortho/partition.c - ${GRAPHVIZ_LIB_DIR}/ortho/rawgraph.c - ${GRAPHVIZ_LIB_DIR}/ortho/sgraph.c - ${GRAPHVIZ_LIB_DIR}/ortho/trapezoid.c + # Source files + ${GRAPHVIZ_LIB_DIR}/ortho/fPQ.c + ${GRAPHVIZ_LIB_DIR}/ortho/maze.c + ${GRAPHVIZ_LIB_DIR}/ortho/ortho.c + ${GRAPHVIZ_LIB_DIR}/ortho/partition.c + ${GRAPHVIZ_LIB_DIR}/ortho/rawgraph.c + ${GRAPHVIZ_LIB_DIR}/ortho/sgraph.c + ${GRAPHVIZ_LIB_DIR}/ortho/trapezoid.c ) target_include_directories(ortho 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/osage/CMakeLists.txt b/cpp/graphviz/lib/osage/CMakeLists.txt index c8b3619d..5406c281 100644 --- a/cpp/graphviz/lib/osage/CMakeLists.txt +++ b/cpp/graphviz/lib/osage/CMakeLists.txt @@ -1,17 +1,17 @@ add_library(osage STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/osage/osage.h + # Header files + ${GRAPHVIZ_LIB_DIR}/osage/osage.h - # Source files - ${GRAPHVIZ_LIB_DIR}/osage/osageinit.c + # Source files + ${GRAPHVIZ_LIB_DIR}/osage/osageinit.c ) target_include_directories(osage 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/pack/CMakeLists.txt b/cpp/graphviz/lib/pack/CMakeLists.txt index 0e50b6d2..db810753 100644 --- a/cpp/graphviz/lib/pack/CMakeLists.txt +++ b/cpp/graphviz/lib/pack/CMakeLists.txt @@ -1,23 +1,23 @@ add_library(pack_obj OBJECT - # Header files - ${GRAPHVIZ_LIB_DIR}/pack/pack.h + # Header files + ${GRAPHVIZ_LIB_DIR}/pack/pack.h - # Source files - ${GRAPHVIZ_LIB_DIR}/pack/ccomps.c - ${GRAPHVIZ_LIB_DIR}/pack/pack.c + # Source files + ${GRAPHVIZ_LIB_DIR}/pack/ccomps.c + ${GRAPHVIZ_LIB_DIR}/pack/pack.c ) target_include_directories(pack_obj PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/pathplan ) add_library(pack STATIC - $ + $ ) diff --git a/cpp/graphviz/lib/patchwork/CMakeLists.txt b/cpp/graphviz/lib/patchwork/CMakeLists.txt index 8791fafb..2525b711 100644 --- a/cpp/graphviz/lib/patchwork/CMakeLists.txt +++ b/cpp/graphviz/lib/patchwork/CMakeLists.txt @@ -1,20 +1,20 @@ add_library(patchwork STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/patchwork/patchwork.h - ${GRAPHVIZ_LIB_DIR}/patchwork/tree_map.h + # Header files + ${GRAPHVIZ_LIB_DIR}/patchwork/patchwork.h + ${GRAPHVIZ_LIB_DIR}/patchwork/tree_map.h - # Source files - ${GRAPHVIZ_LIB_DIR}/patchwork/patchwork.c - ${GRAPHVIZ_LIB_DIR}/patchwork/patchworkinit.c - ${GRAPHVIZ_LIB_DIR}/patchwork/tree_map.c + # Source files + ${GRAPHVIZ_LIB_DIR}/patchwork/patchwork.c + ${GRAPHVIZ_LIB_DIR}/patchwork/patchworkinit.c + ${GRAPHVIZ_LIB_DIR}/patchwork/tree_map.c ) target_include_directories(patchwork 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/pathplan/CMakeLists.txt b/cpp/graphviz/lib/pathplan/CMakeLists.txt index e08f1dc5..a61fa0f7 100644 --- a/cpp/graphviz/lib/pathplan/CMakeLists.txt +++ b/cpp/graphviz/lib/pathplan/CMakeLists.txt @@ -1,26 +1,26 @@ add_library(pathplan STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/pathplan/pathgeom.h - ${GRAPHVIZ_LIB_DIR}/pathplan/pathplan.h - ${GRAPHVIZ_LIB_DIR}/pathplan/pathutil.h - ${GRAPHVIZ_LIB_DIR}/pathplan/solvers.h - ${GRAPHVIZ_LIB_DIR}/pathplan/tri.h - ${GRAPHVIZ_LIB_DIR}/pathplan/vis.h - ${GRAPHVIZ_LIB_DIR}/pathplan/vispath.h + # Header files + ${GRAPHVIZ_LIB_DIR}/pathplan/pathgeom.h + ${GRAPHVIZ_LIB_DIR}/pathplan/pathplan.h + ${GRAPHVIZ_LIB_DIR}/pathplan/pathutil.h + ${GRAPHVIZ_LIB_DIR}/pathplan/solvers.h + ${GRAPHVIZ_LIB_DIR}/pathplan/tri.h + ${GRAPHVIZ_LIB_DIR}/pathplan/vis.h + ${GRAPHVIZ_LIB_DIR}/pathplan/vispath.h - # Source files - ${GRAPHVIZ_LIB_DIR}/pathplan/cvt.c - ${GRAPHVIZ_LIB_DIR}/pathplan/inpoly.c - ${GRAPHVIZ_LIB_DIR}/pathplan/route.c - ${GRAPHVIZ_LIB_DIR}/pathplan/shortest.c - ${GRAPHVIZ_LIB_DIR}/pathplan/shortestpth.c - ${GRAPHVIZ_LIB_DIR}/pathplan/solvers.c - ${GRAPHVIZ_LIB_DIR}/pathplan/triang.c - ${GRAPHVIZ_LIB_DIR}/pathplan/util.c - ${GRAPHVIZ_LIB_DIR}/pathplan/visibility.c + # Source files + ${GRAPHVIZ_LIB_DIR}/pathplan/cvt.c + ${GRAPHVIZ_LIB_DIR}/pathplan/inpoly.c + ${GRAPHVIZ_LIB_DIR}/pathplan/route.c + ${GRAPHVIZ_LIB_DIR}/pathplan/shortest.c + ${GRAPHVIZ_LIB_DIR}/pathplan/shortestpth.c + ${GRAPHVIZ_LIB_DIR}/pathplan/solvers.c + ${GRAPHVIZ_LIB_DIR}/pathplan/triang.c + ${GRAPHVIZ_LIB_DIR}/pathplan/util.c + ${GRAPHVIZ_LIB_DIR}/pathplan/visibility.c ) target_include_directories(pathplan PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR} + ${GRAPHVIZ_LIB_DIR}/pathplan ) diff --git a/cpp/graphviz/lib/rbtree/CMakeLists.txt b/cpp/graphviz/lib/rbtree/CMakeLists.txt index c1605977..e6108bcc 100644 --- a/cpp/graphviz/lib/rbtree/CMakeLists.txt +++ b/cpp/graphviz/lib/rbtree/CMakeLists.txt @@ -1,14 +1,14 @@ add_library(rbtree STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/rbtree/red_black_tree.h - ${GRAPHVIZ_LIB_DIR}/rbtree/stack.h + # Header files + ${GRAPHVIZ_LIB_DIR}/rbtree/red_black_tree.h + ${GRAPHVIZ_LIB_DIR}/rbtree/stack.h - # Source files - ${GRAPHVIZ_LIB_DIR}/rbtree/misc.c - ${GRAPHVIZ_LIB_DIR}/rbtree/red_black_tree.c - ${GRAPHVIZ_LIB_DIR}/rbtree/stack.c + # Source files + ${GRAPHVIZ_LIB_DIR}/rbtree/misc.c + ${GRAPHVIZ_LIB_DIR}/rbtree/red_black_tree.c + ${GRAPHVIZ_LIB_DIR}/rbtree/stack.c ) include_directories(rbtree PRIVATE - ${GRAPHVIZ_LIB_DIR} + ${GRAPHVIZ_LIB_DIR} ) diff --git a/cpp/graphviz/lib/sfdpgen/CMakeLists.txt b/cpp/graphviz/lib/sfdpgen/CMakeLists.txt index e88bad5f..1b4fd121 100644 --- a/cpp/graphviz/lib/sfdpgen/CMakeLists.txt +++ b/cpp/graphviz/lib/sfdpgen/CMakeLists.txt @@ -1,33 +1,33 @@ add_library(sfdpgen STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/sfdpgen/Multilevel.h - ${GRAPHVIZ_LIB_DIR}/sfdpgen/post_process.h - ${GRAPHVIZ_LIB_DIR}/sfdpgen/PriorityQueue.h - ${GRAPHVIZ_LIB_DIR}/sfdpgen/sfdp.h - ${GRAPHVIZ_LIB_DIR}/sfdpgen/sfdpinternal.h - ${GRAPHVIZ_LIB_DIR}/sfdpgen/sparse_solve.h - ${GRAPHVIZ_LIB_DIR}/sfdpgen/spring_electrical.h - ${GRAPHVIZ_LIB_DIR}/sfdpgen/stress_model.h - ${GRAPHVIZ_LIB_DIR}/sfdpgen/uniform_stress.h + # Header files + ${GRAPHVIZ_LIB_DIR}/sfdpgen/Multilevel.h + ${GRAPHVIZ_LIB_DIR}/sfdpgen/post_process.h + ${GRAPHVIZ_LIB_DIR}/sfdpgen/PriorityQueue.h + ${GRAPHVIZ_LIB_DIR}/sfdpgen/sfdp.h + ${GRAPHVIZ_LIB_DIR}/sfdpgen/sfdpinternal.h + ${GRAPHVIZ_LIB_DIR}/sfdpgen/sparse_solve.h + ${GRAPHVIZ_LIB_DIR}/sfdpgen/spring_electrical.h + ${GRAPHVIZ_LIB_DIR}/sfdpgen/stress_model.h + ${GRAPHVIZ_LIB_DIR}/sfdpgen/uniform_stress.h - # Source files - ${GRAPHVIZ_LIB_DIR}/sfdpgen/Multilevel.c - ${GRAPHVIZ_LIB_DIR}/sfdpgen/post_process.c - ${GRAPHVIZ_LIB_DIR}/sfdpgen/PriorityQueue.c - ${GRAPHVIZ_LIB_DIR}/sfdpgen/sfdpinit.c - ${GRAPHVIZ_LIB_DIR}/sfdpgen/sparse_solve.c - ${GRAPHVIZ_LIB_DIR}/sfdpgen/spring_electrical.c - ${GRAPHVIZ_LIB_DIR}/sfdpgen/stress_model.c - ${GRAPHVIZ_LIB_DIR}/sfdpgen/uniform_stress.c + # Source files + ${GRAPHVIZ_LIB_DIR}/sfdpgen/Multilevel.c + ${GRAPHVIZ_LIB_DIR}/sfdpgen/post_process.c + ${GRAPHVIZ_LIB_DIR}/sfdpgen/PriorityQueue.c + ${GRAPHVIZ_LIB_DIR}/sfdpgen/sfdpinit.c + ${GRAPHVIZ_LIB_DIR}/sfdpgen/sparse_solve.c + ${GRAPHVIZ_LIB_DIR}/sfdpgen/spring_electrical.c + ${GRAPHVIZ_LIB_DIR}/sfdpgen/stress_model.c + ${GRAPHVIZ_LIB_DIR}/sfdpgen/uniform_stress.c ) target_include_directories(sfdpgen 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/sparse/CMakeLists.txt b/cpp/graphviz/lib/sparse/CMakeLists.txt index b0b127c4..dd85a545 100644 --- a/cpp/graphviz/lib/sparse/CMakeLists.txt +++ b/cpp/graphviz/lib/sparse/CMakeLists.txt @@ -1,37 +1,35 @@ add_library(sparse STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/sparse/BinaryHeap.h - ${GRAPHVIZ_LIB_DIR}/sparse/clustering.h - ${GRAPHVIZ_LIB_DIR}/sparse/color_palette.h - ${GRAPHVIZ_LIB_DIR}/sparse/colorutil.h - ${GRAPHVIZ_LIB_DIR}/sparse/DotIO.h - ${GRAPHVIZ_LIB_DIR}/sparse/general.h - ${GRAPHVIZ_LIB_DIR}/sparse/IntStack.h - ${GRAPHVIZ_LIB_DIR}/sparse/LinkedList.h - ${GRAPHVIZ_LIB_DIR}/sparse/mq.h - ${GRAPHVIZ_LIB_DIR}/sparse/QuadTree.h - ${GRAPHVIZ_LIB_DIR}/sparse/SparseMatrix.h - ${GRAPHVIZ_LIB_DIR}/sparse/vector.h + # Header files + ${GRAPHVIZ_LIB_DIR}/sparse/BinaryHeap.h + ${GRAPHVIZ_LIB_DIR}/sparse/clustering.h + ${GRAPHVIZ_LIB_DIR}/sparse/color_palette.h + ${GRAPHVIZ_LIB_DIR}/sparse/colorutil.h + ${GRAPHVIZ_LIB_DIR}/sparse/DotIO.h + ${GRAPHVIZ_LIB_DIR}/sparse/general.h + ${GRAPHVIZ_LIB_DIR}/sparse/IntStack.h + ${GRAPHVIZ_LIB_DIR}/sparse/LinkedList.h + ${GRAPHVIZ_LIB_DIR}/sparse/mq.h + ${GRAPHVIZ_LIB_DIR}/sparse/QuadTree.h + ${GRAPHVIZ_LIB_DIR}/sparse/SparseMatrix.h - # Source files - ${GRAPHVIZ_LIB_DIR}/sparse/BinaryHeap.c - ${GRAPHVIZ_LIB_DIR}/sparse/clustering.c - ${GRAPHVIZ_LIB_DIR}/sparse/color_palette.c - ${GRAPHVIZ_LIB_DIR}/sparse/colorutil.c - ${GRAPHVIZ_LIB_DIR}/sparse/DotIO.c - ${GRAPHVIZ_LIB_DIR}/sparse/general.c - ${GRAPHVIZ_LIB_DIR}/sparse/IntStack.c - ${GRAPHVIZ_LIB_DIR}/sparse/LinkedList.c - ${GRAPHVIZ_LIB_DIR}/sparse/mq.c - ${GRAPHVIZ_LIB_DIR}/sparse/QuadTree.c - ${GRAPHVIZ_LIB_DIR}/sparse/SparseMatrix.c - ${GRAPHVIZ_LIB_DIR}/sparse/vector.c + # Source files + ${GRAPHVIZ_LIB_DIR}/sparse/BinaryHeap.c + ${GRAPHVIZ_LIB_DIR}/sparse/clustering.c + ${GRAPHVIZ_LIB_DIR}/sparse/color_palette.c + ${GRAPHVIZ_LIB_DIR}/sparse/colorutil.c + ${GRAPHVIZ_LIB_DIR}/sparse/DotIO.c + ${GRAPHVIZ_LIB_DIR}/sparse/general.c + ${GRAPHVIZ_LIB_DIR}/sparse/IntStack.c + ${GRAPHVIZ_LIB_DIR}/sparse/LinkedList.c + ${GRAPHVIZ_LIB_DIR}/sparse/mq.c + ${GRAPHVIZ_LIB_DIR}/sparse/QuadTree.c + ${GRAPHVIZ_LIB_DIR}/sparse/SparseMatrix.c ) target_include_directories(sparse PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR} + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common ) diff --git a/cpp/graphviz/lib/twopigen/CMakeLists.txt b/cpp/graphviz/lib/twopigen/CMakeLists.txt index 454fdb5e..8b909a86 100644 --- a/cpp/graphviz/lib/twopigen/CMakeLists.txt +++ b/cpp/graphviz/lib/twopigen/CMakeLists.txt @@ -1,18 +1,18 @@ add_library(twopigen STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/twopigen/circle.h + # Header files + ${GRAPHVIZ_LIB_DIR}/twopigen/circle.h - # Source files - ${GRAPHVIZ_LIB_DIR}/twopigen/circle.c - ${GRAPHVIZ_LIB_DIR}/twopigen/twopiinit.c + # Source files + ${GRAPHVIZ_LIB_DIR}/twopigen/circle.c + ${GRAPHVIZ_LIB_DIR}/twopigen/twopiinit.c ) target_include_directories(twopigen 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/vpsc/CMakeLists.txt b/cpp/graphviz/lib/vpsc/CMakeLists.txt index c8133292..8e686c93 100644 --- a/cpp/graphviz/lib/vpsc/CMakeLists.txt +++ b/cpp/graphviz/lib/vpsc/CMakeLists.txt @@ -1,27 +1,27 @@ add_library(vpsc STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/vpsc/block.h - ${GRAPHVIZ_LIB_DIR}/vpsc/blocks.h - ${GRAPHVIZ_LIB_DIR}/vpsc/constraint.h - ${GRAPHVIZ_LIB_DIR}/vpsc/csolve_VPSC.h - ${GRAPHVIZ_LIB_DIR}/vpsc/generate-constraints.h - ${GRAPHVIZ_LIB_DIR}/vpsc/pairingheap/PairingHeap.h - ${GRAPHVIZ_LIB_DIR}/vpsc/pairingheap/dsexceptions.h - ${GRAPHVIZ_LIB_DIR}/vpsc/solve_VPSC.h - ${GRAPHVIZ_LIB_DIR}/vpsc/variable.h + # Header files + ${GRAPHVIZ_LIB_DIR}/vpsc/block.h + ${GRAPHVIZ_LIB_DIR}/vpsc/blocks.h + ${GRAPHVIZ_LIB_DIR}/vpsc/constraint.h + ${GRAPHVIZ_LIB_DIR}/vpsc/csolve_VPSC.h + ${GRAPHVIZ_LIB_DIR}/vpsc/generate-constraints.h + ${GRAPHVIZ_LIB_DIR}/vpsc/pairingheap/PairingHeap.h + ${GRAPHVIZ_LIB_DIR}/vpsc/pairingheap/dsexceptions.h + ${GRAPHVIZ_LIB_DIR}/vpsc/solve_VPSC.h + ${GRAPHVIZ_LIB_DIR}/vpsc/variable.h - # Source files - ${GRAPHVIZ_LIB_DIR}/vpsc/block.cpp - ${GRAPHVIZ_LIB_DIR}/vpsc/blocks.cpp - ${GRAPHVIZ_LIB_DIR}/vpsc/constraint.cpp - ${GRAPHVIZ_LIB_DIR}/vpsc/csolve_VPSC.cpp - ${GRAPHVIZ_LIB_DIR}/vpsc/generate-constraints.cpp - ${GRAPHVIZ_LIB_DIR}/vpsc/pairingheap/PairingHeap.cpp - ${GRAPHVIZ_LIB_DIR}/vpsc/solve_VPSC.cpp - ${GRAPHVIZ_LIB_DIR}/vpsc/variable.cpp + # Source files + ${GRAPHVIZ_LIB_DIR}/vpsc/block.cpp + ${GRAPHVIZ_LIB_DIR}/vpsc/blocks.cpp + ${GRAPHVIZ_LIB_DIR}/vpsc/constraint.cpp + ${GRAPHVIZ_LIB_DIR}/vpsc/csolve_VPSC.cpp + ${GRAPHVIZ_LIB_DIR}/vpsc/generate-constraints.cpp + ${GRAPHVIZ_LIB_DIR}/vpsc/pairingheap/PairingHeap.cpp + ${GRAPHVIZ_LIB_DIR}/vpsc/solve_VPSC.cpp + ${GRAPHVIZ_LIB_DIR}/vpsc/variable.cpp ) target_include_directories(vpsc PRIVATE - ${GRAPHVIZ_LIB_DIR} + ${GRAPHVIZ_LIB_DIR} ) diff --git a/cpp/graphviz/lib/xdot/CMakeLists.txt b/cpp/graphviz/lib/xdot/CMakeLists.txt index d1eca478..c96a55e7 100644 --- a/cpp/graphviz/lib/xdot/CMakeLists.txt +++ b/cpp/graphviz/lib/xdot/CMakeLists.txt @@ -1,12 +1,12 @@ add_library(xdot STATIC - # Header files - ${GRAPHVIZ_LIB_DIR}/xdot/xdot.h + # Header files + ${GRAPHVIZ_LIB_DIR}/xdot/xdot.h - # Source files - ${GRAPHVIZ_LIB_DIR}/xdot/xdot.c + # Source files + ${GRAPHVIZ_LIB_DIR}/xdot/xdot.c ) target_include_directories(xdot PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_LIB_DIR}/xdot + ${GRAPHVIZ_LIB_DIR} + ${GRAPHVIZ_LIB_DIR}/xdot ) diff --git a/cpp/graphviz/plugin/core/CMakeLists.txt b/cpp/graphviz/plugin/core/CMakeLists.txt index fb302036..3abf85c1 100644 --- a/cpp/graphviz/plugin/core/CMakeLists.txt +++ b/cpp/graphviz/plugin/core/CMakeLists.txt @@ -1,39 +1,39 @@ add_library(gvplugin_core STATIC - # Header files - ${GRAPHVIZ_PLUGIN_DIR}/core/ps.h + # Header files + ${GRAPHVIZ_PLUGIN_DIR}/core/ps.h - # Source files - ${GRAPHVIZ_PLUGIN_DIR}/core/gvloadimage_core.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvplugin_core.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_dot.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_json.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_fig.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_map.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_mp.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_pic.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_pov.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_ps.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_svg.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_tk.c - ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_vml.c + # Source files + ${GRAPHVIZ_PLUGIN_DIR}/core/gvloadimage_core.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvplugin_core.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_dot.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_json.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_fig.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_map.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_mp.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_pic.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_pov.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_ps.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_svg.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_tk.c + ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_vml.c ) target_include_directories(gvplugin_core PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_PLUGIN_DIR}/core - ${GRAPHVIZ_BUILD_DIR}/plugin/core - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/gvpr - ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/xdot + ${GRAPHVIZ_LIB_DIR} + ${GRAPHVIZ_PLUGIN_DIR}/core + ${GRAPHVIZ_BUILD_DIR}/plugin/core + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/gvpr + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR}/xdot ) target_link_libraries(gvplugin_core - cdt - cgraph - gvc + cgraph + gvc + xdot ) diff --git a/cpp/graphviz/plugin/dot_layout/CMakeLists.txt b/cpp/graphviz/plugin/dot_layout/CMakeLists.txt index 795708ff..dcc76314 100644 --- a/cpp/graphviz/plugin/dot_layout/CMakeLists.txt +++ b/cpp/graphviz/plugin/dot_layout/CMakeLists.txt @@ -1,24 +1,21 @@ add_library(gvplugin_dot_layout STATIC - # Source files - ${GRAPHVIZ_PLUGIN_DIR}/dot_layout/gvplugin_dot_layout.c - ${GRAPHVIZ_PLUGIN_DIR}/dot_layout/gvlayout_dot_layout.c + # Source files + ${GRAPHVIZ_PLUGIN_DIR}/dot_layout/gvplugin_dot_layout.c + ${GRAPHVIZ_PLUGIN_DIR}/dot_layout/gvlayout_dot_layout.c ) target_include_directories(gvplugin_dot_layout PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_PLUGIN_DIR}/dot_layout - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR} + ${GRAPHVIZ_PLUGIN_DIR}/dot_layout + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/pathplan ) target_link_libraries(gvplugin_dot_layout - cdt - cgraph - dotgen - gvc - pathplan + dotgen + gvc ) diff --git a/cpp/graphviz/plugin/neato_layout/CMakeLists.txt b/cpp/graphviz/plugin/neato_layout/CMakeLists.txt index 326caa13..cd26d160 100644 --- a/cpp/graphviz/plugin/neato_layout/CMakeLists.txt +++ b/cpp/graphviz/plugin/neato_layout/CMakeLists.txt @@ -1,37 +1,34 @@ add_library(gvplugin_neato_layout STATIC - # Source files - ${GRAPHVIZ_PLUGIN_DIR}/neato_layout/gvplugin_neato_layout.c - ${GRAPHVIZ_PLUGIN_DIR}/neato_layout/gvlayout_neato_layout.c + # Source files + ${GRAPHVIZ_PLUGIN_DIR}/neato_layout/gvplugin_neato_layout.c + ${GRAPHVIZ_PLUGIN_DIR}/neato_layout/gvlayout_neato_layout.c ) target_include_directories(gvplugin_neato_layout PRIVATE - ${GRAPHVIZ_LIB_DIR} - ${GRAPHVIZ_PLUGIN_DIR}/neato_layout - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR} + ${GRAPHVIZ_PLUGIN_DIR}/neato_layout + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/pathplan ) target_link_libraries(gvplugin_neato_layout - cdt - cgraph - circogen - fdpgen - gvc - neatogen - osage - patchwork - pathplan - rbtree - sparse - twopigen - - # with_ipsepcola - vpsc + circogen + fdpgen + gvc + neatogen + osage + patchwork + rbtree + sparse + twopigen + + # with_ipsepcola + vpsc - # with_sfdp - sfdpgen + # with_sfdp + sfdpgen ) diff --git a/package-lock.json b/package-lock.json index b9ef8e4c..171a745d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,29 +16,29 @@ }, "devDependencies": { "@rollup/plugin-alias": "^3.1.9", - "@rollup/plugin-commonjs": "^21.0.1", + "@rollup/plugin-commonjs": "^21.0.2", "@rollup/plugin-node-resolve": "^13.1.3", - "@rollup/plugin-replace": "^3.0.1", + "@rollup/plugin-replace": "^4.0.0", "@types/chai": "^4.3.0", "@types/mocha": "^9.1.0", - "@typescript-eslint/eslint-plugin": "^5.10.2", - "@typescript-eslint/parser": "^5.10.2", + "@typescript-eslint/eslint-plugin": "^5.12.1", + "@typescript-eslint/parser": "^5.12.1", "chai": "^4.3.6", - "eslint": "^8.8.0", - "karma": "^6.3.15", + "eslint": "^8.10.0", + "karma": "^6.3.16", "karma-chai": "^0.1.0", "karma-chrome-launcher": "^3.1.0", "karma-mocha": "^2.0.1", "karma-spec-reporter": "^0.0.33", "local-web-server": "^5.1.1", - "mocha": "^9.2.0", + "mocha": "^9.2.1", "npm-run-all": "^4.1.5", "rimraf": "^3.0.2", - "rollup": "^2.67.0", + "rollup": "^2.68.0", "rollup-plugin-sourcemaps": "^0.6.3", "run-script-os": "^1.1.6", "standard-version": "^9.3.2", - "terser": "^5.10.0", + "terser": "^5.11.0", "tslib": "^2.3.1", "typescript": "^4.5.5" } @@ -160,14 +160,14 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz", - "integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.0.tgz", + "integrity": "sha512-igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.2.0", + "espree": "^9.3.1", "globals": "^13.9.0", "ignore": "^4.0.6", "import-fresh": "^3.2.1", @@ -280,9 +280,9 @@ } }, "node_modules/@rollup/plugin-commonjs": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-21.0.1.tgz", - "integrity": "sha512-EA+g22lbNJ8p5kuZJUYyhhDK7WgJckW5g4pNN7n4mAFUM96VuwUnNT3xr2Db2iCZPI1pJPbGyfT5mS9T1dHfMg==", + "version": "21.0.2", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-21.0.2.tgz", + "integrity": "sha512-d/OmjaLVO4j/aQX69bwpWPpbvI3TJkQuxoAk7BH8ew1PyoMBLTOuvJTjzG8oEoW7drIIqB0KCJtfFLu/2GClWg==", "dev": true, "dependencies": { "@rollup/pluginutils": "^3.1.0", @@ -321,9 +321,9 @@ } }, "node_modules/@rollup/plugin-replace": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-3.0.1.tgz", - "integrity": "sha512-989J5oRzf3mm0pO/0djTijdfEh9U3n63BIXN5X7T4U9BP+fN4oxQ6DvDuBvFaHA6scaHQRclqmKQEkBhB7k7Hg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-4.0.0.tgz", + "integrity": "sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==", "dev": true, "dependencies": { "@rollup/pluginutils": "^3.1.0", @@ -435,14 +435,14 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.2.tgz", - "integrity": "sha512-4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.1.tgz", + "integrity": "sha512-M499lqa8rnNK7mUv74lSFFttuUsubIRdAbHcVaP93oFcKkEmHmLqy2n7jM9C8DVmFMYK61ExrZU6dLYhQZmUpw==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.10.2", - "@typescript-eslint/type-utils": "5.10.2", - "@typescript-eslint/utils": "5.10.2", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/type-utils": "5.12.1", + "@typescript-eslint/utils": "5.12.1", "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", "ignore": "^5.1.8", @@ -468,14 +468,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.10.2.tgz", - "integrity": "sha512-JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.12.1.tgz", + "integrity": "sha512-6LuVUbe7oSdHxUWoX/m40Ni8gsZMKCi31rlawBHt7VtW15iHzjbpj2WLiToG2758KjtCCiLRKZqfrOdl3cNKuw==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.10.2", - "@typescript-eslint/types": "5.10.2", - "@typescript-eslint/typescript-estree": "5.10.2", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/typescript-estree": "5.12.1", "debug": "^4.3.2" }, "engines": { @@ -495,13 +495,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.2.tgz", - "integrity": "sha512-39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.1.tgz", + "integrity": "sha512-J0Wrh5xS6XNkd4TkOosxdpObzlYfXjAFIm9QxYLCPOcHVv1FyyFCPom66uIh8uBr0sZCrtS+n19tzufhwab8ZQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.10.2", - "@typescript-eslint/visitor-keys": "5.10.2" + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/visitor-keys": "5.12.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -512,12 +512,12 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.2.tgz", - "integrity": "sha512-uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.12.1.tgz", + "integrity": "sha512-Gh8feEhsNLeCz6aYqynh61Vsdy+tiNNkQtc+bN3IvQvRqHkXGUhYkUi+ePKzP0Mb42se7FDb+y2SypTbpbR/Sg==", "dev": true, "dependencies": { - "@typescript-eslint/utils": "5.10.2", + "@typescript-eslint/utils": "5.12.1", "debug": "^4.3.2", "tsutils": "^3.21.0" }, @@ -538,9 +538,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.2.tgz", - "integrity": "sha512-Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.1.tgz", + "integrity": "sha512-hfcbq4qVOHV1YRdhkDldhV9NpmmAu2vp6wuFODL71Y0Ixak+FLeEU4rnPxgmZMnGreGEghlEucs9UZn5KOfHJA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -551,13 +551,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.2.tgz", - "integrity": "sha512-WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.1.tgz", + "integrity": "sha512-ahOdkIY9Mgbza7L9sIi205Pe1inCkZWAHE1TV1bpxlU4RZNPtXaDZfiiFWcL9jdxvW1hDYZJXrFm+vlMkXRbBw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.10.2", - "@typescript-eslint/visitor-keys": "5.10.2", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/visitor-keys": "5.12.1", "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", @@ -578,15 +578,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.2.tgz", - "integrity": "sha512-vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.1.tgz", + "integrity": "sha512-Qq9FIuU0EVEsi8fS6pG+uurbhNTtoYr4fq8tKjBupsK5Bgbk2I32UGm0Sh+WOyjOPgo/5URbxxSNV6HYsxV4MQ==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.10.2", - "@typescript-eslint/types": "5.10.2", - "@typescript-eslint/typescript-estree": "5.10.2", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/typescript-estree": "5.12.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -602,12 +602,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.2.tgz", - "integrity": "sha512-zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.1.tgz", + "integrity": "sha512-l1KSLfupuwrXx6wc0AuOmC7Ko5g14ZOQ86wJJqRbdLbXLK02pK/DPiDDqCc7BqqiiA04/eAA6ayL0bgOrAkH7A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.10.2", + "@typescript-eslint/types": "5.12.1", "eslint-visitor-keys": "^3.0.0" }, "engines": { @@ -2265,12 +2265,12 @@ } }, "node_modules/eslint": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.8.0.tgz", - "integrity": "sha512-H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.10.0.tgz", + "integrity": "sha512-tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.0.5", + "@eslint/eslintrc": "^1.2.0", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -2278,10 +2278,10 @@ "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.0", + "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", - "eslint-visitor-keys": "^3.2.0", - "espree": "^9.3.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.3.1", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -2357,18 +2357,18 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz", - "integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz", - "integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", + "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -2400,14 +2400,14 @@ } }, "node_modules/espree": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz", - "integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==", + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz", + "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==", "dev": true, "dependencies": { "acorn": "^8.7.0", "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^3.1.0" + "eslint-visitor-keys": "^3.3.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -3013,9 +3013,9 @@ } }, "node_modules/globals": { - "version": "13.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", - "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", + "version": "13.12.1", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz", + "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -3797,9 +3797,9 @@ } }, "node_modules/karma": { - "version": "6.3.15", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.15.tgz", - "integrity": "sha512-4O5X6zVFdmwo/fgjRN84fPG3IvaiOxOjIeZBwBrQYz4nIyGqlF8Wm7C1Hr7idQ9NHgnvJM+LSjZwS1C+qALMGw==", + "version": "6.3.16", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.16.tgz", + "integrity": "sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ==", "dev": true, "dependencies": { "body-parser": "^1.19.0", @@ -5002,9 +5002,9 @@ } }, "node_modules/mocha": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz", - "integrity": "sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz", + "integrity": "sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==", "dev": true, "dependencies": { "@ungap/promise-all-settled": "1.1.2", @@ -6065,9 +6065,9 @@ } }, "node_modules/rollup": { - "version": "2.67.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.67.0.tgz", - "integrity": "sha512-W83AaERwvDiHwHEF/dfAfS3z1Be5wf7n+pO3ZAO5IQadCT2lBTr7WQ2MwZZe+nodbD+n3HtC4OCOAdsOPPcKZQ==", + "version": "2.68.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.68.0.tgz", + "integrity": "sha512-XrMKOYK7oQcTio4wyTz466mucnd8LzkiZLozZ4Rz0zQD+HeX4nUK4B8GrTX/2EvN2/vBF/i2WnaXboPxo0JylA==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -6833,11 +6833,12 @@ } }, "node_modules/terser": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", - "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.11.0.tgz", + "integrity": "sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==", "dev": true, "dependencies": { + "acorn": "^8.5.0", "commander": "^2.20.0", "source-map": "~0.7.2", "source-map-support": "~0.5.20" @@ -6847,14 +6848,6 @@ }, "engines": { "node": ">=10" - }, - "peerDependencies": { - "acorn": "^8.5.0" - }, - "peerDependenciesMeta": { - "acorn": { - "optional": true - } } }, "node_modules/terser/node_modules/source-map": { @@ -7541,14 +7534,14 @@ } }, "@eslint/eslintrc": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz", - "integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.0.tgz", + "integrity": "sha512-igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.2.0", + "espree": "^9.3.1", "globals": "^13.9.0", "ignore": "^4.0.6", "import-fresh": "^3.2.1", @@ -7633,9 +7626,9 @@ } }, "@rollup/plugin-commonjs": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-21.0.1.tgz", - "integrity": "sha512-EA+g22lbNJ8p5kuZJUYyhhDK7WgJckW5g4pNN7n4mAFUM96VuwUnNT3xr2Db2iCZPI1pJPbGyfT5mS9T1dHfMg==", + "version": "21.0.2", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-21.0.2.tgz", + "integrity": "sha512-d/OmjaLVO4j/aQX69bwpWPpbvI3TJkQuxoAk7BH8ew1PyoMBLTOuvJTjzG8oEoW7drIIqB0KCJtfFLu/2GClWg==", "dev": true, "requires": { "@rollup/pluginutils": "^3.1.0", @@ -7662,9 +7655,9 @@ } }, "@rollup/plugin-replace": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-3.0.1.tgz", - "integrity": "sha512-989J5oRzf3mm0pO/0djTijdfEh9U3n63BIXN5X7T4U9BP+fN4oxQ6DvDuBvFaHA6scaHQRclqmKQEkBhB7k7Hg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-4.0.0.tgz", + "integrity": "sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==", "dev": true, "requires": { "@rollup/pluginutils": "^3.1.0", @@ -7766,14 +7759,14 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.2.tgz", - "integrity": "sha512-4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.1.tgz", + "integrity": "sha512-M499lqa8rnNK7mUv74lSFFttuUsubIRdAbHcVaP93oFcKkEmHmLqy2n7jM9C8DVmFMYK61ExrZU6dLYhQZmUpw==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.10.2", - "@typescript-eslint/type-utils": "5.10.2", - "@typescript-eslint/utils": "5.10.2", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/type-utils": "5.12.1", + "@typescript-eslint/utils": "5.12.1", "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", "ignore": "^5.1.8", @@ -7783,52 +7776,52 @@ } }, "@typescript-eslint/parser": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.10.2.tgz", - "integrity": "sha512-JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.12.1.tgz", + "integrity": "sha512-6LuVUbe7oSdHxUWoX/m40Ni8gsZMKCi31rlawBHt7VtW15iHzjbpj2WLiToG2758KjtCCiLRKZqfrOdl3cNKuw==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.10.2", - "@typescript-eslint/types": "5.10.2", - "@typescript-eslint/typescript-estree": "5.10.2", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/typescript-estree": "5.12.1", "debug": "^4.3.2" } }, "@typescript-eslint/scope-manager": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.2.tgz", - "integrity": "sha512-39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.1.tgz", + "integrity": "sha512-J0Wrh5xS6XNkd4TkOosxdpObzlYfXjAFIm9QxYLCPOcHVv1FyyFCPom66uIh8uBr0sZCrtS+n19tzufhwab8ZQ==", "dev": true, "requires": { - "@typescript-eslint/types": "5.10.2", - "@typescript-eslint/visitor-keys": "5.10.2" + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/visitor-keys": "5.12.1" } }, "@typescript-eslint/type-utils": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.2.tgz", - "integrity": "sha512-uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.12.1.tgz", + "integrity": "sha512-Gh8feEhsNLeCz6aYqynh61Vsdy+tiNNkQtc+bN3IvQvRqHkXGUhYkUi+ePKzP0Mb42se7FDb+y2SypTbpbR/Sg==", "dev": true, "requires": { - "@typescript-eslint/utils": "5.10.2", + "@typescript-eslint/utils": "5.12.1", "debug": "^4.3.2", "tsutils": "^3.21.0" } }, "@typescript-eslint/types": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.2.tgz", - "integrity": "sha512-Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.1.tgz", + "integrity": "sha512-hfcbq4qVOHV1YRdhkDldhV9NpmmAu2vp6wuFODL71Y0Ixak+FLeEU4rnPxgmZMnGreGEghlEucs9UZn5KOfHJA==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.2.tgz", - "integrity": "sha512-WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.1.tgz", + "integrity": "sha512-ahOdkIY9Mgbza7L9sIi205Pe1inCkZWAHE1TV1bpxlU4RZNPtXaDZfiiFWcL9jdxvW1hDYZJXrFm+vlMkXRbBw==", "dev": true, "requires": { - "@typescript-eslint/types": "5.10.2", - "@typescript-eslint/visitor-keys": "5.10.2", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/visitor-keys": "5.12.1", "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", @@ -7837,26 +7830,26 @@ } }, "@typescript-eslint/utils": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.2.tgz", - "integrity": "sha512-vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.1.tgz", + "integrity": "sha512-Qq9FIuU0EVEsi8fS6pG+uurbhNTtoYr4fq8tKjBupsK5Bgbk2I32UGm0Sh+WOyjOPgo/5URbxxSNV6HYsxV4MQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.10.2", - "@typescript-eslint/types": "5.10.2", - "@typescript-eslint/typescript-estree": "5.10.2", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/typescript-estree": "5.12.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/visitor-keys": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.2.tgz", - "integrity": "sha512-zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.1.tgz", + "integrity": "sha512-l1KSLfupuwrXx6wc0AuOmC7Ko5g14ZOQ86wJJqRbdLbXLK02pK/DPiDDqCc7BqqiiA04/eAA6ayL0bgOrAkH7A==", "dev": true, "requires": { - "@typescript-eslint/types": "5.10.2", + "@typescript-eslint/types": "5.12.1", "eslint-visitor-keys": "^3.0.0" } }, @@ -9133,12 +9126,12 @@ "dev": true }, "eslint": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.8.0.tgz", - "integrity": "sha512-H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.10.0.tgz", + "integrity": "sha512-tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw==", "dev": true, "requires": { - "@eslint/eslintrc": "^1.0.5", + "@eslint/eslintrc": "^1.2.0", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -9146,10 +9139,10 @@ "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.0", + "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", - "eslint-visitor-keys": "^3.2.0", - "espree": "^9.3.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.3.1", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -9176,9 +9169,9 @@ }, "dependencies": { "eslint-scope": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz", - "integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", + "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", "dev": true, "requires": { "esrecurse": "^4.3.0", @@ -9230,20 +9223,20 @@ } }, "eslint-visitor-keys": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz", - "integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "dev": true }, "espree": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz", - "integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==", + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz", + "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==", "dev": true, "requires": { "acorn": "^8.7.0", "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^3.1.0" + "eslint-visitor-keys": "^3.3.0" } }, "esquery": { @@ -9715,9 +9708,9 @@ } }, "globals": { - "version": "13.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", - "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", + "version": "13.12.1", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz", + "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -10280,9 +10273,9 @@ } }, "karma": { - "version": "6.3.15", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.15.tgz", - "integrity": "sha512-4O5X6zVFdmwo/fgjRN84fPG3IvaiOxOjIeZBwBrQYz4nIyGqlF8Wm7C1Hr7idQ9NHgnvJM+LSjZwS1C+qALMGw==", + "version": "6.3.16", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.16.tgz", + "integrity": "sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ==", "dev": true, "requires": { "body-parser": "^1.19.0", @@ -11249,9 +11242,9 @@ } }, "mocha": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz", - "integrity": "sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz", + "integrity": "sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==", "dev": true, "requires": { "@ungap/promise-all-settled": "1.1.2", @@ -12042,9 +12035,9 @@ } }, "rollup": { - "version": "2.67.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.67.0.tgz", - "integrity": "sha512-W83AaERwvDiHwHEF/dfAfS3z1Be5wf7n+pO3ZAO5IQadCT2lBTr7WQ2MwZZe+nodbD+n3HtC4OCOAdsOPPcKZQ==", + "version": "2.68.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.68.0.tgz", + "integrity": "sha512-XrMKOYK7oQcTio4wyTz466mucnd8LzkiZLozZ4Rz0zQD+HeX4nUK4B8GrTX/2EvN2/vBF/i2WnaXboPxo0JylA==", "dev": true, "requires": { "fsevents": "~2.3.2" @@ -12646,11 +12639,12 @@ } }, "terser": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", - "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.11.0.tgz", + "integrity": "sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==", "dev": true, "requires": { + "acorn": "^8.5.0", "commander": "^2.20.0", "source-map": "~0.7.2", "source-map-support": "~0.5.20" diff --git a/package.json b/package.json index 5f51f28f..66fb4ef0 100644 --- a/package.json +++ b/package.json @@ -76,29 +76,29 @@ }, "devDependencies": { "@rollup/plugin-alias": "^3.1.9", - "@rollup/plugin-commonjs": "^21.0.1", + "@rollup/plugin-commonjs": "^21.0.2", "@rollup/plugin-node-resolve": "^13.1.3", - "@rollup/plugin-replace": "^3.0.1", + "@rollup/plugin-replace": "^4.0.0", "@types/chai": "^4.3.0", "@types/mocha": "^9.1.0", - "@typescript-eslint/eslint-plugin": "^5.10.2", - "@typescript-eslint/parser": "^5.10.2", + "@typescript-eslint/eslint-plugin": "^5.12.1", + "@typescript-eslint/parser": "^5.12.1", "chai": "^4.3.6", - "eslint": "^8.8.0", - "karma": "^6.3.15", + "eslint": "^8.10.0", + "karma": "^6.3.16", "karma-chai": "^0.1.0", "karma-chrome-launcher": "^3.1.0", "karma-mocha": "^2.0.1", "karma-spec-reporter": "^0.0.33", "local-web-server": "^5.1.1", - "mocha": "^9.2.0", + "mocha": "^9.2.1", "npm-run-all": "^4.1.5", "rimraf": "^3.0.2", - "rollup": "^2.67.0", + "rollup": "^2.68.0", "rollup-plugin-sourcemaps": "^0.6.3", "run-script-os": "^1.1.6", "standard-version": "^9.3.2", - "terser": "^5.10.0", + "terser": "^5.11.0", "tslib": "^2.3.1", "typescript": "^4.5.5" }, diff --git a/scripts/cpp-install-emsdk.sh b/scripts/cpp-install-emsdk.sh index e7963b7d..182075e8 100755 --- a/scripts/cpp-install-emsdk.sh +++ b/scripts/cpp-install-emsdk.sh @@ -8,6 +8,6 @@ fi cd ./emsdk git fetch git pull -./emsdk install 3.0.0-upstream -./emsdk activate 3.0.0-upstream +./emsdk install 3.1.6-upstream +./emsdk activate 3.1.6-upstream cd .. diff --git a/scripts/cpp-install-expat.sh b/scripts/cpp-install-expat.sh index 87b3a857..75513b69 100755 --- a/scripts/cpp-install-expat.sh +++ b/scripts/cpp-install-expat.sh @@ -3,10 +3,10 @@ if [ ! -d "src-expat" ] then # https://github.com/libexpat/libexpat/tags - wget -c https://github.com/libexpat/libexpat/archive/R_2_4_1.tar.gz + wget -c https://github.com/libexpat/libexpat/archive/R_2_4_6.tar.gz mkdir ./src-expat - tar -xzf ./R_2_4_1.tar.gz -C ./src-expat --strip-components=1 - rm ./R_2_4_1.tar.gz + tar -xzf ./R_2_4_6.tar.gz -C ./src-expat --strip-components=1 + rm ./R_2_4_6.tar.gz # Configure --- cd ./src-expat/expat diff --git a/scripts/cpp-install-graphviz.sh b/scripts/cpp-install-graphviz.sh index 9e9128e3..b0295be7 100755 --- a/scripts/cpp-install-graphviz.sh +++ b/scripts/cpp-install-graphviz.sh @@ -3,10 +3,10 @@ if [ ! -d "src-graphviz" ] then # https://gitlab.com/graphviz/graphviz/-/tags - wget -c https://gitlab.com/graphviz/graphviz/-/archive/2.50.0/graphviz-2.50.0.tar.gz + wget -c https://gitlab.com/graphviz/graphviz/-/archive/3.0.0/graphviz-3.0.0.tar.gz mkdir ./src-graphviz - tar -xzf ./graphviz-2.50.0.tar.gz -C ./src-graphviz --strip-components=1 - rm ./graphviz-2.50.0.tar.gz + tar -xzf ./graphviz-3.0.0.tar.gz -C ./src-graphviz --strip-components=1 + rm ./graphviz-3.0.0.tar.gz # Generate grammar files (and others) --- cd ./src-graphviz