From 5fc556523c8d76566559816829d37ba834f56182 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Fri, 11 Nov 2022 03:12:53 -0500
Subject: [PATCH] add libxil as a submodule

---
 fpga/.gitmodules        | 3 +++
 fpga/CMakeLists.txt     | 2 +-
 fpga/lib/CMakeLists.txt | 3 +--
 fpga/thirdparty/libxil  | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 160000 fpga/thirdparty/libxil

diff --git a/fpga/.gitmodules b/fpga/.gitmodules
index b12235a30..6dab7a587 100644
--- a/fpga/.gitmodules
+++ b/fpga/.gitmodules
@@ -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
diff --git a/fpga/CMakeLists.txt b/fpga/CMakeLists.txt
index b4f429b44..8d409c9df 100644
--- a/fpga/CMakeLists.txt
+++ b/fpga/CMakeLists.txt
@@ -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)
 
diff --git a/fpga/lib/CMakeLists.txt b/fpga/lib/CMakeLists.txt
index 1302dbdff..11adf763f 100644
--- a/fpga/lib/CMakeLists.txt
+++ b/fpga/lib/CMakeLists.txt
@@ -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
 )
 
diff --git a/fpga/thirdparty/libxil b/fpga/thirdparty/libxil
new file mode 160000
index 000000000..b29129552
--- /dev/null
+++ b/fpga/thirdparty/libxil
@@ -0,0 +1 @@
+Subproject commit b2912955266a6fe8f4f869bf0207497607744d63