mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
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
This commit is contained in:
commit
e91be5ed2c
6 changed files with 19 additions and 5 deletions
|
@ -1,3 +1,5 @@
|
|||
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
|
||||
|
|
15
fpga/lib/common/CMakeLists.txt
Normal file
15
fpga/lib/common/CMakeLists.txt
Normal file
|
@ -0,0 +1,15 @@
|
|||
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)
|
Loading…
Add table
Reference in a new issue