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: remove option WITH_IO

Browse source
This commit is contained in:
Steffen Vogel 2019-04-05 10:47:24 +02:00
parent e6a4c0dfad
commit 2866ad65a6
6 changed files with 22 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -71,7 +71,7 @@ build:fedora:x86_64:
build:fedora-minimal:x86_64:
extends: build:fedora:x86_64
variables:
CMAKE_OPTS: -DWITH_HOOKS=OFF -DWITH_IO=OFF -DWITH_WEB=OFF -DWITH_API=OFF -DWITH_CONFIG=OFF -DWITH_SRC=OFF -DWITH_TOOLS=OFF -DWITH_TESTS=OFF -DWITH_PLUGINS=OFF -DWITH_CLIENTS=OFF -DWITH_DOC=OFF
CMAKE_OPTS: -DWITH_HOOKS=OFF -DWITH_WEB=OFF -DWITH_API=OFF -DWITH_CONFIG=OFF -DWITH_SRC=OFF -DWITH_TOOLS=OFF -DWITH_TESTS=OFF -DWITH_PLUGINS=OFF -DWITH_CLIENTS=OFF -DWITH_DOC=OFF
build:ubuntu:x86_64:
extends: build:fedora:x86_64

2
CMakeLists.txt
View file

@ -115,7 +115,6 @@ endif()
# Build options
option(WITH_HOOKS "Build with support for processing hook plugins" ON)
option(WITH_IO "Build with support format plugins" ON)
option(WITH_WEB "Build with internal webserver" ON)
option(WITH_API "Build with remote control API" ON)
option(WITH_CONFIG "Build with support for libconfig configuration syntax" ON)
@ -173,7 +172,6 @@ configure_file(
# Show feature summary
add_feature_info(HOOKS WITH_HOOKS "Build with support for processing hook plugins")
add_feature_info(IO WITH_IO "Build with support format plugins")
add_feature_info(WEB WITH_WEB "Build with internal webserver")
add_feature_info(API WITH_API "Build with remote control API")
add_feature_info(CONFIG WITH_CONFIG "Build with support for libconfig configuration syntax")

1
include/villas/node/config.h.in
View file

@ -51,7 +51,6 @@
#cmakedefine WITH_WEB
#cmakedefine WITH_API
#cmakedefine WITH_HOOKS
#cmakedefine WITH_IO
/* OS Headers */
#cmakedefine HAS_EVENTFD

16
lib/CMakeLists.txt
View file

@ -63,6 +63,9 @@ set(LIB_SRC
stats.c
super_node.cpp
socket_addr.c
io.c
format_type.c
)
if(IBVERBS_FOUND AND RDMACM_FOUND)
@ -72,21 +75,14 @@ endif()
add_subdirectory(nodes)
list(APPEND WHOLE_ARCHIVES nodes)
add_subdirectory(formats)
list(APPEND WHOLE_ARCHIVES formats)
if(LIBCONFIG_FOUND)
list(APPEND INCLUDE_DIRS ${LIBCONFIG_INCLUDE_DIRS})
list(APPEND LIBRARIES PkgConfig::LIBCONFIG)
endif()
if(WITH_IO)
list(APPEND LIB_SRC
io.c
format_type.c
)
add_subdirectory(formats)
list(APPEND WHOLE_ARCHIVES formats)
endif()
if(WITH_HOOKS)
list(APPEND LIB_SRC
hook.cpp

7
lib/hooks/CMakeLists.txt
View file

@ -38,14 +38,9 @@ set(HOOK_SRC
skip_first.cpp
stats.cpp
ts.cpp
print.cpp
)
if(WITH_IO)
list(APPEND HOOK_SRC
print.cpp
)
endif()
add_library(hooks STATIC ${HOOK_SRC})
target_include_directories(hooks PUBLIC ${INCLUDE_DIRS})
target_link_libraries(hooks INTERFACE ${LIBRARIES} PUBLIC villas-common)

30
src/CMakeLists.txt
View file

@ -47,27 +47,25 @@ if(WITH_WEB)
)
endif()
if(WITH_IO)
add_executable(villas-test-cmp villas-test-cmp.cpp)
target_link_libraries(villas-test-cmp PUBLIC villas)
add_executable(villas-test-cmp villas-test-cmp.cpp)
target_link_libraries(villas-test-cmp PUBLIC villas)
add_executable(villas-convert villas-convert.cpp)
target_link_libraries(villas-convert PUBLIC villas)
add_executable(villas-convert villas-convert.cpp)
target_link_libraries(villas-convert PUBLIC villas)
add_executable(villas-pipe villas-pipe.cpp)
target_link_libraries(villas-pipe PUBLIC villas Threads::Threads)
add_executable(villas-pipe villas-pipe.cpp)
target_link_libraries(villas-pipe PUBLIC villas Threads::Threads)
add_executable(villas-signal villas-signal.cpp)
target_link_libraries(villas-signal PUBLIC villas)
add_executable(villas-signal villas-signal.cpp)
target_link_libraries(villas-signal PUBLIC villas)
install(
TARGETS villas-convert villas-pipe villas-signal villas-test-cmp
COMPONENT bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
endif()
install(
TARGETS villas-convert villas-pipe villas-signal villas-test-cmp
COMPONENT bin
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
if(WITH_IO AND WITH_HOOKS)
if(WITH_HOOKS)
add_executable(villas-hook villas-hook.cpp)
target_link_libraries(villas-hook PUBLIC villas)