From c423f96b9a6dc0f00dfb1e57f8411643a4bbfe30 Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Fri, 20 Jan 2017 17:55:41 +0100 Subject: [PATCH] Add lib/vpsc to CMake build The static library 'vpsc' has no dependencies, but the `WITH_IPSEPCOLA` option had to be added, for this is also done in the Autotools build. This library is disabled by default due to C++ portability issues. --- CMakeLists.txt | 1 + lib/CMakeLists.txt | 1 + lib/vpsc/CMakeLists.txt | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 lib/vpsc/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ab14565a..890f9a9d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,7 @@ project (Graphviz) # Build options # ============= +option(WITH_IPSEPCOLA "IPSEPCOLA features in neato layout engine (disabled by default - C++ portability issues)." OFF ) option(WITH_ORTHO "ORTHO features in neato layout engine." ON ) # Append local CMake module directory diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index a19450e53..3741e3199 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -15,6 +15,7 @@ add_subdirectory(sparse) add_subdirectory(spine) add_subdirectory(twopigen) add_subdirectory(vmalloc) +add_subdirectory(vpsc) add_subdirectory(xdot) # Dependent on: cdt diff --git a/lib/vpsc/CMakeLists.txt b/lib/vpsc/CMakeLists.txt new file mode 100644 index 000000000..9c23a1e76 --- /dev/null +++ b/lib/vpsc/CMakeLists.txt @@ -0,0 +1,32 @@ +if (WITH_IPSEPCOLA) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} +) + +add_library(vpsc STATIC + # Header files + block.h + blocks.h + constraint.h + csolve_VPSC.h + generate-constraints.h + pairingheap/PairingHeap.h + pairingheap/dsexceptions.h + remove_rectangle_overlap.h + solve_VPSC.h + variable.h + + # Source files + block.cpp + blocks.cpp + constraint.cpp + csolve_VPSC.cpp + generate-constraints.cpp + pairingheap/PairingHeap.cpp + remove_rectangle_overlap.cpp + solve_VPSC.cpp + variable.cpp +) + +endif (WITH_IPSEPCOLA) \ No newline at end of file -- 2.40.0