Commit 9439b26c authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼
Browse files

Merge branch 'feature/villas-common' into 'develop'

Start splitting common parts (plugin, logging, memory, ...) into a separate library

See merge request acs/public/villas/VILLASfpga-code!8
parents bbeb017a f76f1770
Pipeline #49306 failed with stages
in 1 minute and 17 seconds
add_subdirectory(common)
set(SOURCES
vlnv.cpp
card.cpp
......@@ -21,11 +23,6 @@ set(SOURCES
log.c
log_config.c
log_helper.c
plugin.cpp
utils.cpp
memory_manager.cpp
memory.cpp
)
include(FindPkgConfig)
......@@ -37,6 +34,8 @@ find_package(Threads)
add_library(villas-fpga SHARED ${SOURCES})
target_link_libraries(villas-fpga PUBLIC villas-common)
target_compile_definitions(villas-fpga PRIVATE
BUILDID=\"abc\"
_GNU_SOURCE
......
cmake_minimum_required(VERSION 3.7)
project(villas-common)
add_library(villas-common SHARED
plugin.cpp
utils.cpp
memory.cpp
memory_manager.cpp)
target_include_directories(villas-common
PUBLIC
${CMAKE_CURRENT_LIST_DIR}/../../include/villas
${CMAKE_CURRENT_LIST_DIR}/../../include
${CMAKE_CURRENT_LIST_DIR}/../../thirdparty/spdlog/include)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment