Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

graphviz: fix broken detection

Browse source
This commit is contained in:
Steffen Vogel 2020-03-04 13:59:46 +01:00
parent 26500efb5b
commit 9c2c99696e
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -106,7 +106,7 @@ pkg_check_modules(COMEDILIB IMPORTED_TARGET comedilib>=0.11.0)
pkg_check_modules(LIBZMQ IMPORTED_TARGET libzmq>=2.2.0)
pkg_check_modules(LIBULDAQ IMPORTED_TARGET libuldaq>=1.0.0)
pkg_check_modules(UUID IMPORTED_TARGET REQUIRED uuid>=2.23)
pkg_check_modules(NANOMSG IMPORTED_TARGET libcgraph>=2.30)
pkg_check_modules(CGRAPH IMPORTED_TARGET libcgraph>=2.30)
pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg)
if(NOT NANOMSG_FOUND)
pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0)
@ -127,7 +127,7 @@ cmake_dependent_option(WITH_TESTS "Run tests"
cmake_dependent_option(WITH_PLUGINS "Build plugins" ON "TOPLEVEL_PROJECT" OFF)
cmake_dependent_option(WITH_CLIENTS "Build client applications" ON "TOPLEVEL_PROJECT" OFF)
cmake_dependent_option(WITH_DOC "Build documentation" ON "TOPLEVEL_PROJECT" OFF)
cmake_dependent_option(WITH_GRAPHVIZ "Build with Graphviz" ON "Graphviz_FOUND" OFF)
cmake_dependent_option(WITH_GRAPHVIZ "Build with Graphviz" ON "CGRAPH_FOUND" OFF)
cmake_dependent_option(WITH_NODE_AMQP "Build with amqp node-type" ON "RABBITMQ_C_FOUND" OFF)
cmake_dependent_option(WITH_NODE_COMEDI "Build with comedi node-type" ON "COMEDILIB_FOUND" OFF)

4
include/villas/super_node.hpp
View file

@ -26,7 +26,9 @@
#include <villas/node/config.h>
#ifdef WITH_GRAPHVIZ
#include <graphviz/gvc.h>
extern "C" {
#include <graphviz/gvc.h>
}
#endif
#include <fstream>

10
lib/CMakeLists.txt
View file

@ -77,6 +77,11 @@ if(WITH_WEB)
list(APPEND LIBRARIES PkgConfig::LIBWEBSOCKETS ${LIBWEBSOCKETS_LDFLAGS})
endif()
if(WITH_GRAPHVIZ)
list(APPEND INCLUDE_DIRS ${CGRAPH_INCLUDE_DIRS})
list(APPEND LIBRARIES PkgConfig::CGRAPH)
endif()
if(WITH_NODE_INFINIBAND)
list(APPEND LIB_SRC memory/ib.cpp)
endif()
@ -92,11 +97,6 @@ if(WITH_CONFIG)
list(APPEND LIBRARIES PkgConfig::LIBCONFIG)
endif()
if(WITH_GRAPHVIZ)
list(APPEND INCLUDE_DIRS ${GRAPHVIZ_INCLUDE_DIRS})
list(APPEND LIBRARIES ${GRAPHVIZ_LIBRARIES})
endif()
if(WITH_HOOKS)
list(APPEND LIB_SRC
hook.cpp