From 3ab7b7f84dde8c189eb987b3e7af7d53ddf3884c Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 29 Feb 2024 21:40:05 +0100 Subject: [PATCH] Use spaces for indention of CMake files Signed-off-by: Steffen Vogel --- cmake/FindEtherlab.cmake | 12 ++--- cmake/FindIBVerbs.cmake | 6 +-- cmake/FindOpal.cmake | 44 +++++++-------- cmake/FindRDMACM.cmake | 6 +-- cmake/FindSymbol.cmake | 20 +++---- cmake/GetVersion.cmake | 2 +- common/lib/CMakeLists.txt | 92 ++++++++++++++++---------------- common/tests/unit/CMakeLists.txt | 34 ++++++------ etc/CMakeLists.txt | 12 ++--- fpga/CMakeLists.txt | 6 +-- fpga/gpu/CMakeLists.txt | 28 +++++----- fpga/lib/CMakeLists.txt | 84 ++++++++++++++--------------- fpga/src/CMakeLists.txt | 4 +- fpga/tests/unit/CMakeLists.txt | 32 +++++------ lib/CMakeLists.txt | 8 +-- lib/nodes/CMakeLists.txt | 8 +-- packaging/CMakeLists.txt | 26 ++++----- src/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 18 +++---- tests/integration/CMakeLists.txt | 22 ++++---- tests/unit/CMakeLists.txt | 42 +++++++-------- 21 files changed, 254 insertions(+), 254 deletions(-) diff --git a/cmake/FindEtherlab.cmake b/cmake/FindEtherlab.cmake index 95a22afab..2dd757d34 100644 --- a/cmake/FindEtherlab.cmake +++ b/cmake/FindEtherlab.cmake @@ -6,15 +6,15 @@ # SPDX-License-Identifier: Apache-2.0 find_path(ETHERLAB_INCLUDE_DIR - NAMES ecrt.h - PATHS - /opt/etherlab/include + NAMES ecrt.h + PATHS + /opt/etherlab/include ) find_library(ETHERLAB_LIBRARY - NAMES ethercat - PATHS - /opt/etherlab/lib + NAMES ethercat + PATHS + /opt/etherlab/lib ) include(FindPackageHandleStandardArgs) diff --git a/cmake/FindIBVerbs.cmake b/cmake/FindIBVerbs.cmake index 38806105f..d04c14479 100644 --- a/cmake/FindIBVerbs.cmake +++ b/cmake/FindIBVerbs.cmake @@ -5,18 +5,18 @@ # SPDX-License-Identifier: Apache-2.0 find_path(IBVERBS_INCLUDE_DIR - NAMES infiniband/verbs.h + NAMES infiniband/verbs.h ) find_library(IBVERBS_LIBRARY - NAMES ibverbs + NAMES ibverbs ) 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 IBVERBS_INCLUDE_DIR) + IBVERBS_LIBRARY IBVERBS_INCLUDE_DIR) mark_as_advanced(IBVERBS_INCLUDE_DIR IBVERBS_LIBRARY) diff --git a/cmake/FindOpal.cmake b/cmake/FindOpal.cmake index 4cfb5656d..71f44915f 100644 --- a/cmake/FindOpal.cmake +++ b/cmake/FindOpal.cmake @@ -7,41 +7,41 @@ set(OPAL_PREFIX /usr/opalrt/common) find_path(OPAL_INCLUDE_DIR - NAMES AsyncApi.h - HINTS - ${OPAL_PREFIX}/include_target/ - ${PROJECT_SOURCE_DIR}/libopal/include/opal/ + NAMES AsyncApi.h + HINTS + ${OPAL_PREFIX}/include_target/ + ${PROJECT_SOURCE_DIR}/libopal/include/opal/ ) find_library(OPAL_LIBRARY - NAMES OpalAsyncApiCore - HINTS - ${OPAL_PREFIX}/lib/ - ${PROJECT_SOURCE_DIR}/libopal/ + NAMES OpalAsyncApiCore + HINTS + ${OPAL_PREFIX}/lib/ + ${PROJECT_SOURCE_DIR}/libopal/ ) find_library(OPAL_LIBRARY_IRC - NAMES irc - HINTS - ${OPAL_PREFIX}/lib/ - ${PROJECT_SOURCE_DIR}/libopal/ + NAMES irc + HINTS + ${OPAL_PREFIX}/lib/ + ${PROJECT_SOURCE_DIR}/libopal/ ) find_library(OPAL_LIBRARY_UTILS - NAMES OpalUtils - HINTS - ${OPAL_PREFIX}/lib/redhawk/ - ${OPAL_PREFIX}/lib/redhawk64/ - ${PROJECT_SOURCE_DIR}/libopal/ + NAMES OpalUtils + HINTS + ${OPAL_PREFIX}/lib/redhawk/ + ${OPAL_PREFIX}/lib/redhawk64/ + ${PROJECT_SOURCE_DIR}/libopal/ ) find_library(OPAL_LIBRARY_CORE - NAMES OpalCore - HINTS - ${OPAL_PREFIX}/lib/redhawk/ - ${OPAL_PREFIX}/lib/redhawk64/ - ${PROJECT_SOURCE_DIR}/libopal/ + NAMES OpalCore + HINTS + ${OPAL_PREFIX}/lib/redhawk/ + ${OPAL_PREFIX}/lib/redhawk64/ + ${PROJECT_SOURCE_DIR}/libopal/ ) include(FindPackageHandleStandardArgs) diff --git a/cmake/FindRDMACM.cmake b/cmake/FindRDMACM.cmake index 6e6f92ef7..2230f6272 100644 --- a/cmake/FindRDMACM.cmake +++ b/cmake/FindRDMACM.cmake @@ -5,18 +5,18 @@ # SPDX-License-Identifier: Apache-2.0 find_path(RDMACM_INCLUDE_DIR - NAMES rdma/rdma_cma.h + NAMES rdma/rdma_cma.h ) find_library(RDMACM_LIBRARY - NAMES rdmacm + NAMES rdmacm ) 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(RDMACM DEFAULT_MSG - RDMACM_LIBRARY RDMACM_INCLUDE_DIR) + RDMACM_LIBRARY RDMACM_INCLUDE_DIR) mark_as_advanced(RDMACM_INCLUDE_DIR RDMACM_LIBRARY) diff --git a/cmake/FindSymbol.cmake b/cmake/FindSymbol.cmake index 0b566ef95..ebacdf87c 100644 --- a/cmake/FindSymbol.cmake +++ b/cmake/FindSymbol.cmake @@ -5,16 +5,16 @@ # SPDX-License-Identifier: Apache-2.0 function(FindSymbol LIBRARY SYMBOL FOUND) - find_program(OBJDUMP_EXECUTABLE NAMES objdump) + find_program(OBJDUMP_EXECUTABLE NAMES objdump) - execute_process( - COMMAND /bin/sh -c "${OBJDUMP_EXECUTABLE} -T ${LIBRARY} | grep ${SYMBOL} | wc -l" - OUTPUT_VARIABLE OUTPUT - ) + execute_process( + COMMAND /bin/sh -c "${OBJDUMP_EXECUTABLE} -T ${LIBRARY} | grep ${SYMBOL} | wc -l" + OUTPUT_VARIABLE OUTPUT + ) - if(OUTPUT GREATER 0) - set(${FOUND} "${SYMBOL}" PARENT_SCOPE) - else() - set(${FOUND} "${SYMBOL}-NOTFOUND" PARENT_SCOPE) - endif() + if(OUTPUT GREATER 0) + set(${FOUND} "${SYMBOL}" PARENT_SCOPE) + else() + set(${FOUND} "${SYMBOL}-NOTFOUND" PARENT_SCOPE) + endif() endfunction() diff --git a/cmake/GetVersion.cmake b/cmake/GetVersion.cmake index 688f92c6d..9fdc6f71f 100644 --- a/cmake/GetVersion.cmake +++ b/cmake/GetVersion.cmake @@ -40,7 +40,7 @@ function(GetVersion DIR PREFIX) "Make sure that the source directory is a Git repo and " "contains at least one valid tag like 'v0.1.0'" ) - else() + else() set(FOUND_GIT_VERSION ON PARENT_SCOPE) string(REGEX REPLACE "^v([0-9]+\\.[0-9]+\\.[0-9]+)$" "\\1" VERSION ${VERSION_STR}) diff --git a/common/lib/CMakeLists.txt b/common/lib/CMakeLists.txt index afb095be5..0e4190f4d 100644 --- a/common/lib/CMakeLists.txt +++ b/common/lib/CMakeLists.txt @@ -8,70 +8,70 @@ add_library(villas-common SHARED - base64.cpp - buffer.cpp - common.cpp - compat.cpp - cpuset.cpp - dsp/pid.cpp - hist.cpp - kernel/kernel.cpp - kernel/rt.cpp - list.cpp - log.cpp - memory_manager.cpp - memory.cpp - plugin.cpp - popen.cpp - table.cpp - task.cpp - terminal.cpp - timing.cpp - tool.cpp - utils.cpp - uuid.cpp - version.cpp + base64.cpp + buffer.cpp + common.cpp + compat.cpp + cpuset.cpp + dsp/pid.cpp + hist.cpp + kernel/kernel.cpp + kernel/rt.cpp + list.cpp + log.cpp + memory_manager.cpp + memory.cpp + plugin.cpp + popen.cpp + table.cpp + task.cpp + terminal.cpp + timing.cpp + tool.cpp + utils.cpp + uuid.cpp + version.cpp ) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - target_sources(villas-common PRIVATE tsc.cpp) + target_sources(villas-common PRIVATE tsc.cpp) endif() if(CMAKE_SYSTEM_NAME STREQUAL Linux) - target_sources(villas-common PRIVATE - kernel/pci.cpp - kernel/vfio_device.cpp - kernel/vfio_group.cpp - kernel/vfio_container.cpp - ) + target_sources(villas-common PRIVATE + kernel/pci.cpp + kernel/vfio_device.cpp + kernel/vfio_group.cpp + kernel/vfio_container.cpp + ) endif() target_include_directories(villas-common PUBLIC - ${OPENSSL_INCLUDE_DIR} - ${CURL_INCLUDE_DIRS} - ${PROJECT_BINARY_DIR}/common/include - ${PROJECT_SOURCE_DIR}/common/include + ${OPENSSL_INCLUDE_DIR} + ${CURL_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/common/include + ${PROJECT_SOURCE_DIR}/common/include ) target_link_libraries(villas-common PUBLIC - PkgConfig::JANSSON - PkgConfig::UUID - ${OPENSSL_LIBRARIES} - ${CURL_LIBRARIES} - ${CMAKE_DL_LIBS} - spdlog::spdlog - fmt::fmt - stdc++ + PkgConfig::JANSSON + PkgConfig::UUID + ${OPENSSL_LIBRARIES} + ${CURL_LIBRARIES} + ${CMAKE_DL_LIBS} + spdlog::spdlog + fmt::fmt + stdc++ ) if(WITH_CONFIG) - target_link_libraries(villas-common PUBLIC - PkgConfig::LIBCONFIG - ) + target_link_libraries(villas-common PUBLIC + PkgConfig::LIBCONFIG + ) endif() target_compile_definitions(villas-common PUBLIC - -D__STDC_FORMAT_MACROS -D_GNU_SOURCE + -D__STDC_FORMAT_MACROS -D_GNU_SOURCE ) set_target_properties(villas-common PROPERTIES diff --git a/common/tests/unit/CMakeLists.txt b/common/tests/unit/CMakeLists.txt index fed95c055..0da325f7f 100644 --- a/common/tests/unit/CMakeLists.txt +++ b/common/tests/unit/CMakeLists.txt @@ -7,33 +7,33 @@ # VILLAScommon add_executable(unit-tests-common - buffer.cpp - graph.cpp - hist.cpp - kernel.cpp - list.cpp - task.cpp - timing.cpp - utils.cpp - base64.cpp - popen.cpp + buffer.cpp + graph.cpp + hist.cpp + kernel.cpp + list.cpp + task.cpp + timing.cpp + utils.cpp + base64.cpp + popen.cpp ) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - list(APPEND TEST_SRC tsc.cpp) + list(APPEND TEST_SRC tsc.cpp) endif() target_include_directories(unit-tests-common PUBLIC - ${PROJECT_SOURCE_DIR}/common/include - ${CRITERION_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/common/include + ${CRITERION_INCLUDE_DIRS} ) target_link_libraries(unit-tests-common PUBLIC - villas-common - ${CRITERION_LIBRARIES} + villas-common + ${CRITERION_LIBRARIES} ) add_custom_target(run-unit-tests-common - COMMAND $ ${CRITERION_OPTS} - USES_TERMINAL + COMMAND $ ${CRITERION_OPTS} + USES_TERMINAL ) diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt index b4b9ca7f9..d71e5870e 100644 --- a/etc/CMakeLists.txt +++ b/etc/CMakeLists.txt @@ -5,10 +5,10 @@ # SPDX-License-Identifier: Apache-2.0 install( - DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMPONENT bin - DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/villas/node - FILES_MATCHING - PATTERN "*.conf" - PATTERN "*.json" + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMPONENT bin + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/villas/node + FILES_MATCHING + PATTERN "*.conf" + PATTERN "*.json" ) diff --git a/fpga/CMakeLists.txt b/fpga/CMakeLists.txt index 906e6df9e..8ab7979e4 100644 --- a/fpga/CMakeLists.txt +++ b/fpga/CMakeLists.txt @@ -9,9 +9,9 @@ include(CheckLanguage) check_language(CUDA) if(CMAKE_CUDA_COMPILER) - add_subdirectory(gpu) + add_subdirectory(gpu) else() - message("No CUDA support, not building GPU library") + message("No CUDA support, not building GPU library") endif() include(FindPkgConfig) @@ -31,7 +31,7 @@ add_subdirectory(lib) add_subdirectory(src) if(CRITERION_FOUND) - add_subdirectory(tests/unit) + add_subdirectory(tests/unit) endif() # Project settings diff --git a/fpga/gpu/CMakeLists.txt b/fpga/gpu/CMakeLists.txt index 5dac61d74..5ba17eb58 100644 --- a/fpga/gpu/CMakeLists.txt +++ b/fpga/gpu/CMakeLists.txt @@ -7,32 +7,32 @@ add_subdirectory(thirdparty/gdrcopy) add_library(villas-gpu - SHARED - src/gpu.cpp - src/kernels.cu + SHARED + src/gpu.cpp + src/kernels.cu ) target_compile_options(villas-gpu PRIVATE -g) set_source_files_properties(src/gpu.cpp PROPERTIES - LANGUAGE CUDA + LANGUAGE CUDA ) target_include_directories(villas-gpu - PRIVATE - /opt/cuda/include + PRIVATE + /opt/cuda/include ) target_link_libraries(villas-gpu - PUBLIC - villas-common - gdrapi - cuda + PUBLIC + villas-common + gdrapi + cuda ) target_include_directories(villas-gpu - PUBLIC - ${CMAKE_CURRENT_LIST_DIR}/include - PRIVATE - ${CMAKE_CURRENT_LIST_DIR} + PUBLIC + ${CMAKE_CURRENT_LIST_DIR}/include + PRIVATE + ${CMAKE_CURRENT_LIST_DIR} ) diff --git a/fpga/lib/CMakeLists.txt b/fpga/lib/CMakeLists.txt index d6c4436b5..bc7fd9208 100644 --- a/fpga/lib/CMakeLists.txt +++ b/fpga/lib/CMakeLists.txt @@ -5,74 +5,74 @@ # SPDX-License-Identifier: Apache-2.0 set(SOURCES - vlnv.cpp - card.cpp - pcie_card.cpp - core.cpp - node.cpp - utils.cpp - dma.cpp + vlnv.cpp + card.cpp + pcie_card.cpp + core.cpp + node.cpp + utils.cpp + dma.cpp - ips/aurora_xilinx.cpp - ips/aurora.cpp - ips/bram.cpp - ips/dino.cpp - ips/dma.cpp - ips/emc.cpp - ips/fifo.cpp - ips/gpio.cpp - ips/intc.cpp - ips/pcie.cpp - ips/rtds.cpp - ips/switch.cpp - ips/timer.cpp - ips/i2c.cpp - ips/register.cpp + ips/aurora_xilinx.cpp + ips/aurora.cpp + ips/bram.cpp + ips/dino.cpp + ips/dma.cpp + ips/emc.cpp + ips/fifo.cpp + ips/gpio.cpp + ips/intc.cpp + ips/pcie.cpp + ips/rtds.cpp + ips/switch.cpp + ips/timer.cpp + ips/i2c.cpp + ips/register.cpp - ips/rtds2gpu/rtds2gpu.cpp - ips/rtds2gpu/xrtds2gpu.c - ips/rtds2gpu/gpu2rtds.cpp + ips/rtds2gpu/rtds2gpu.cpp + ips/rtds2gpu/xrtds2gpu.c + ips/rtds2gpu/gpu2rtds.cpp ) # we don't have much influence on drivers generated by Xilinx, so ignore warnings set_source_files_properties(ips/rtds2gpu/xrtds2gpu.c - PROPERTIES COMPILE_FLAGS -Wno-int-to-pointer-cast) + PROPERTIES COMPILE_FLAGS -Wno-int-to-pointer-cast) add_library(villas-fpga SHARED ${SOURCES}) target_link_libraries(villas-fpga PUBLIC villas-common) target_compile_definitions(villas-fpga PRIVATE - BUILDID=\"abc\" - _GNU_SOURCE + BUILDID=\"abc\" + _GNU_SOURCE ) target_include_directories(villas-fpga - PUBLIC - ${PROJECT_BINARY_DIR}/include - ${PROJECT_SOURCE_DIR}/fpga/include - ${JANSSON_INCLUDE_DIRS} + PUBLIC + ${PROJECT_BINARY_DIR}/include + ${PROJECT_SOURCE_DIR}/fpga/include + ${JANSSON_INCLUDE_DIRS} ) target_link_libraries(villas-fpga PUBLIC - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} - m - xil - villas-common - "$<$,$,9.0>>:stdc++fs>" + ${CMAKE_THREAD_LIBS_INIT} + ${CMAKE_DL_LIBS} + m + xil + villas-common + "$<$,$,9.0>>:stdc++fs>" ) if(CMAKE_CUDA_COMPILER) - target_link_libraries(villas-fpga PUBLIC villas-gpu) + target_link_libraries(villas-fpga PUBLIC villas-gpu) endif() include(GNUInstallDirs) install(TARGETS villas-fpga - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static ) install(DIRECTORY ../include/villas DESTINATION include) diff --git a/fpga/src/CMakeLists.txt b/fpga/src/CMakeLists.txt index 2d158b2f3..ae3df6add 100644 --- a/fpga/src/CMakeLists.txt +++ b/fpga/src/CMakeLists.txt @@ -7,13 +7,13 @@ add_executable(villas-fpga-ctrl villas-fpga-ctrl.cpp) target_link_libraries(villas-fpga-ctrl PUBLIC - villas-fpga + villas-fpga ) add_executable(villas-fpga-pipe villas-fpga-pipe.cpp) target_link_libraries(villas-fpga-pipe PUBLIC - villas-fpga + villas-fpga ) diff --git a/fpga/tests/unit/CMakeLists.txt b/fpga/tests/unit/CMakeLists.txt index 5dd25100a..e5bbc2a66 100644 --- a/fpga/tests/unit/CMakeLists.txt +++ b/fpga/tests/unit/CMakeLists.txt @@ -5,13 +5,13 @@ # SPDX-License-Identifier: Apache-2.0 set(SOURCES - dma.cpp - fifo.cpp - fpga.cpp - logging.cpp - main.cpp - rtds.cpp - timer.cpp + dma.cpp + fifo.cpp + fpga.cpp + logging.cpp + main.cpp + rtds.cpp + timer.cpp ) # rtds_rtt.cpp @@ -21,27 +21,27 @@ set(SOURCES add_executable(unit-tests-fpga ${SOURCES}) if (CMAKE_CUDA_COMPILER) - enable_language(CUDA) - target_sources(unit-tests-fpga PRIVATE - gpu.cpp rtds2gpu.cpp gpu_kernels.cu) + enable_language(CUDA) + target_sources(unit-tests-fpga PRIVATE + gpu.cpp rtds2gpu.cpp gpu_kernels.cu) endif () target_include_directories(unit-tests-fpga PUBLIC - ../include - ${CRITERION_INCLUDE_DIRECTORIES} + ../include + ${CRITERION_INCLUDE_DIRECTORIES} ) target_link_libraries(unit-tests-fpga PUBLIC - villas-fpga - ${CRITERION_LIBRARIES} + villas-fpga + ${CRITERION_LIBRARIES} ) add_executable(villasfpga-dma dma.c) target_include_directories(villasfpga-dma PUBLIC - ../include + ../include ) target_link_libraries(villasfpga-dma PUBLIC - villas-fpga + villas-fpga ) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 81a1a2975..e95215e5a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -40,7 +40,7 @@ set(LIB_SRC path_destination.cpp path_source.cpp path.cpp - path_list.cpp + path_list.cpp pool.cpp queue_signalled.cpp queue.cpp @@ -68,7 +68,7 @@ if(WITH_GRAPHVIZ) endif() if(WITH_LUA) - list(APPEND INCLUDE_DIRS ${LUA_INCLUDE_DIR}) + list(APPEND INCLUDE_DIRS ${LUA_INCLUDE_DIR}) list(APPEND LIBRARIES ${LUA_LIBRARIES}) endif() @@ -120,8 +120,8 @@ if(LIBNL3_ROUTE_FOUND) endif() if(LIBUSB_FOUND) - list(APPEND LIB_SRC usb.cpp) - list(APPEND LIBRARIES PkgConfig::LIBUSB) + list(APPEND LIB_SRC usb.cpp) + list(APPEND LIBRARIES PkgConfig::LIBUSB) endif() if(WITH_FPGA) diff --git a/lib/nodes/CMakeLists.txt b/lib/nodes/CMakeLists.txt index 25340dda4..3625dc7cc 100644 --- a/lib/nodes/CMakeLists.txt +++ b/lib/nodes/CMakeLists.txt @@ -180,14 +180,14 @@ endif() # Enable Redis support if(WITH_NODE_REDIS) - list(APPEND NODE_SRC redis.cpp) - list(APPEND LIBRARIES PkgConfig::HIREDIS PkgConfig::REDISPP) + list(APPEND NODE_SRC redis.cpp) + list(APPEND LIBRARIES PkgConfig::HIREDIS PkgConfig::REDISPP) endif() # Enable WebRTC support if(WITH_NODE_WEBRTC) - list(APPEND NODE_SRC webrtc.cpp webrtc/signaling_client.cpp webrtc/signaling_message.cpp webrtc/peer_connection.cpp) - list(APPEND LIBRARIES LibDataChannel::LibDataChannel) + list(APPEND NODE_SRC webrtc.cpp webrtc/signaling_client.cpp webrtc/signaling_message.cpp webrtc/peer_connection.cpp) + list(APPEND LIBRARIES LibDataChannel::LibDataChannel) endif() add_library(nodes STATIC ${NODE_SRC}) diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt index 0767f6fcd..1299859ee 100644 --- a/packaging/CMakeLists.txt +++ b/packaging/CMakeLists.txt @@ -5,34 +5,34 @@ # SPDX-License-Identifier: Apache-2.0 if (NOT DEFINED DEPLOY_USER) - set(DEPLOY_USER deploy) + set(DEPLOY_USER deploy) endif() if (NOT DEFINED DEPLOY_HOST) - set(DEPLOY_USER acs-os-fein-website) + set(DEPLOY_USER acs-os-fein-website) endif() if (NOT DEFINED DEPLOY_PATH) - set(DEPLOY_USER /var/www/villas/node) + set(DEPLOY_USER /var/www/villas/node) endif() add_custom_target(deploy-dist - COMMAND rsync ${PROJECT_BINARY_DIR}/*.tar.gz ${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PATH}/src + COMMAND rsync ${PROJECT_BINARY_DIR}/*.tar.gz ${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PATH}/src ) - + add_custom_target(deploy-rpm - COMMAND rsync -a --progress ${PROJECT_BINARY_DIR}/*.rpm ${DEPLOY_USER}@${DEPLOY_HOST}:/var/www/packages/redhat/ - COMMAND ssh ${DEPLOY_USER}@${DEPLOY_HOST} createrepo /var/www/packages/redhat + COMMAND rsync -a --progress ${PROJECT_BINARY_DIR}/*.rpm ${DEPLOY_USER}@${DEPLOY_HOST}:/var/www/packages/redhat/ + COMMAND ssh ${DEPLOY_USER}@${DEPLOY_HOST} createrepo /var/www/packages/redhat ) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/libvillas.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/libvillas.pc - @ONLY + ${CMAKE_CURRENT_SOURCE_DIR}/libvillas.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libvillas.pc + @ONLY ) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libvillas.pc - COMPONENT devel - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig + FILES ${CMAKE_CURRENT_BINARY_DIR}/libvillas.pc + COMPONENT devel + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fab2f82ca..49f16db82 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,7 +36,7 @@ add_executable(villas-signal villas-signal.cpp) target_link_libraries(villas-signal PUBLIC villas) if(WITH_NODE_OPAL) - target_include_directories(villas-node PRIVATE ${OPAL_INCLUDE_DIRS}) + target_include_directories(villas-node PRIVATE ${OPAL_INCLUDE_DIRS}) target_link_libraries(villas-node PRIVATE ${OPAL_LIBRARIES}) endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f60df66d0..e2f9f64d6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,17 +9,17 @@ add_custom_target(run-tests) add_subdirectory(integration) if(CRITERION_FOUND) - add_subdirectory(unit) + add_subdirectory(unit) endif() if(WITH_SRC AND WITH_HOOKS) - set(VALGRIND "valgrind --leak-check=full --show-leak-kinds=all --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/valgrind.supp") + set(VALGRIND "valgrind --leak-check=full --show-leak-kinds=all --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/valgrind.supp") - add_custom_target(run-valgrind - COMMAND ${VALGRIND} $ & sleep 2; kill %1 - COMMAND ${VALGRIND} $ -t 2 ${PROJECT_SOURCE_DIR}/etc/websocket-loopback.conf ws1 - COMMAND ${VALGRIND} $ mixed -v 4 -l 10 - COMMAND ${VALGRIND} $ stats < <($ mixed -l 5) - ) - add_dependencies(run-valgrind villas-node villas-pipe villas-signal villas-hook) + add_custom_target(run-valgrind + COMMAND ${VALGRIND} $ & sleep 2; kill %1 + COMMAND ${VALGRIND} $ -t 2 ${PROJECT_SOURCE_DIR}/etc/websocket-loopback.conf ws1 + COMMAND ${VALGRIND} $ mixed -v 4 -l 10 + COMMAND ${VALGRIND} $ stats < <($ mixed -l 5) + ) + add_dependencies(run-valgrind villas-node villas-pipe villas-signal villas-hook) endif() diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index cbb51aa19..777ea498d 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -5,17 +5,17 @@ # SPDX-License-Identifier: Apache-2.0 add_custom_target(run-integration-tests - COMMAND - /bin/bash -o pipefail -c \" - SRCDIR=${PROJECT_SOURCE_DIR} - BUILDDIR=${PROJECT_BINARY_DIR} - ${PROJECT_SOURCE_DIR}/tools/integration-tests.sh 2>&1 | c++filt\" - USES_TERMINAL - DEPENDS - villas-node - villas-pipe - villas-signal - villas-hook + COMMAND + /bin/bash -o pipefail -c \" + SRCDIR=${PROJECT_SOURCE_DIR} + BUILDDIR=${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/tools/integration-tests.sh 2>&1 | c++filt\" + USES_TERMINAL + DEPENDS + villas-node + villas-pipe + villas-signal + villas-hook ) add_dependencies(run-tests run-integration-tests) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index d8aee5f19..f9098e53e 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -5,34 +5,34 @@ # SPDX-License-Identifier: Apache-2.0 set(TEST_SRC - config_json.cpp - config.cpp - format.cpp - helpers.cpp - json.cpp - main.cpp - mapping.cpp - memory.cpp - pool.cpp - queue_signalled.cpp - queue.cpp - signal.cpp + config_json.cpp + config.cpp + format.cpp + helpers.cpp + json.cpp + main.cpp + mapping.cpp + memory.cpp + pool.cpp + queue_signalled.cpp + queue.cpp + signal.cpp ) add_executable(unit-tests ${TEST_SRC}) target_link_libraries(unit-tests PUBLIC - PkgConfig::CRITERION - Threads::Threads - villas + PkgConfig::CRITERION + Threads::Threads + villas ) add_custom_target(run-unit-tests - COMMAND - /bin/bash -o pipefail -c \" - $ 2>&1 | c++filt\" - DEPENDS - unit-tests - USES_TERMINAL + COMMAND + /bin/bash -o pipefail -c \" + $ 2>&1 | c++filt\" + DEPENDS + unit-tests + USES_TERMINAL ) add_dependencies(tests unit-tests)