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

add libxil as a submodule

Browse source
This commit is contained in:
Steffen Vogel 2022-11-11 03:12:53 -05:00
parent 228d929840
commit 5fc556523c
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fpga/.gitmodules vendored
View file

@ -7,3 +7,6 @@
[submodule "common"]
path = common
url = ../../common.git
[submodule "thirdparty/libxil"]
path = thirdparty/libxil
url = https://git.rwth-aachen.de/acs/public/villas/fpga/libxil.git

2
fpga/CMakeLists.txt
View file

@ -54,7 +54,6 @@ include(FindPkgConfig)
set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig")
pkg_check_modules(JANSSON REQUIRED IMPORTED_TARGET jansson)
pkg_check_modules(XIL REQUIRED IMPORTED_TARGET libxil>=0.1.1)
find_package(Threads)
find_package(Criterion)
@ -62,6 +61,7 @@ find_package(Criterion)
include_directories(thirdparty/CLI11)
include_directories(thirdparty/rang)
add_subdirectory(thirdparty/libxil)
add_subdirectory(lib)
add_subdirectory(src)

3
fpga/lib/CMakeLists.txt
View file

@ -61,16 +61,15 @@ target_include_directories(villas-fpga
PUBLIC
${PROJECT_BINARY_DIR}/include
${PROJECT_SOURCE_DIR}/include
${XIL_INCLUDE_DIRS}
${JANSSON_INCLUDE_DIRS}
)
target_link_libraries(villas-fpga PUBLIC
${XIL_LINK_LIBRARIES}
${JANSSON_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${CMAKE_DL_LIBS}
m
xil
villas-common
)

1
fpga/thirdparty/libxil vendored Submodule

@ -0,0 +1 @@
Subproject commit b2912955266a6fe8f4f869bf0207497607744d63