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

cmake: fix Lua and IBVerbs detection

Browse source
This commit is contained in:
Steffen Vogel 2021-06-18 20:19:46 -04:00
parent edd84d79af
commit c3cd33779a
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -83,10 +83,11 @@ endif()
find_package(PkgConfig REQUIRED)
find_package(Threads REQUIRED)
find_package(Opal)
find_package(IBVERBS)
find_package(IBVerbs)
find_package(RDMACM)
find_package(spdlog)
find_package(Etherlab)
find_package(Lua)
# Check for tools
find_program(PASTE NAMES paste)
@ -104,7 +105,6 @@ pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.9)
pkg_check_modules(LIBWEBSOCKETS IMPORTED_TARGET REQUIRED libwebsockets>=2.3.0)
pkg_check_modules(PROTOBUF IMPORTED_TARGET protobuf>=2.6.0)
pkg_check_modules(PROTOBUFC IMPORTED_TARGET libprotobuf-c>=1.1.0)
pkg_check_modules(LUA IMPORTED_TARGET lua>=5.1)
pkg_check_modules(CRITERION IMPORTED_TARGET criterion>=2.3.1)
pkg_check_modules(LIBNL3_ROUTE IMPORTED_TARGET libnl-route-3.0>=3.2.27)
pkg_check_modules(LIBIEC61850 IMPORTED_TARGET libiec61850>=1.2)
@ -159,7 +159,7 @@ cmake_dependent_option(WITH_NODE_EXEC "Build with exec node-type"
cmake_dependent_option(WITH_NODE_FILE "Build with file node-type" ON "" OFF)
cmake_dependent_option(WITH_NODE_FPGA "Build with fpga node-type" ON "WITH_FPGA" OFF)
cmake_dependent_option(WITH_NODE_IEC61850 "Build with iec61850 node-types" ON "LIBIEC61850_FOUND" OFF)
cmake_dependent_option(WITH_NODE_INFINIBAND "Build with infiniband node-type" ON "IBVERBS_FOUND; RDMACM_FOUND" OFF)
cmake_dependent_option(WITH_NODE_INFINIBAND "Build with infiniband node-type" ON "FALSE; IBVerbs_FOUND; RDMACM_FOUND" OFF) # Infiniband node-type is currenly broken
cmake_dependent_option(WITH_NODE_INFLUXDB "Build with influxdb node-type" ON "" OFF)
cmake_dependent_option(WITH_NODE_KAFKA "Build with kafka node-type" ON "RDKAFKA_FOUND" OFF)
cmake_dependent_option(WITH_NODE_LOOPBACK "Build with loopback node-type" ON "" OFF)

4
cmake/FindIBVerbs.cmake
View file

@ -31,8 +31,8 @@ find_library(IBVERBS_LIBRARY
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set VILLASNODE_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(IBVERBS DEFAULT_MSG
IBVERBS_LIBRARY MOSQUITTO_INCLUDE_DIR)
find_package_handle_standard_args(IBVerbs DEFAULT_MSG
IBVERBS_LIBRARY IBVERBS_INCLUDE_DIR)
mark_as_advanced(IBVERBS_INCLUDE_DIR IBVERBS_LIBRARY)

3
lib/CMakeLists.txt
View file

@ -88,7 +88,8 @@ if(WITH_GRAPHVIZ)
endif()
if(WITH_LUA)
list(APPEND LIBRARIES PkgConfig::LUA)
list(APPEND INCLUDE_DIRS ${LUA_INCLUDE_DIR})
list(APPEND LIBRARIES ${LUA_LIBRARIES})
endif()
if(WITH_NODE_INFINIBAND)

1
lib/nodes/infiniband.cpp
View file

@ -32,6 +32,7 @@
#include <villas/memory.h>
#include <villas/memory/ib.h>
#include <villas/timing.h>
#include <villas/exceptions.hpp>
using namespace villas;
using namespace villas::node;