From 9870749546e7344c99cbce940b2fb57d06a463ae Mon Sep 17 00:00:00 2001
From: Daniel Krebs <github@daniel-krebs.net>
Date: Fri, 13 Apr 2018 16:09:02 +0200
Subject: [PATCH 1/2] lib/common: move plugin, utils and memory stuf into
 common library

---
 fpga/lib/CMakeLists.txt                  |  9 ++++-----
 fpga/lib/common/CMakeLists.txt           | 13 +++++++++++++
 fpga/lib/{ => common}/memory.cpp         |  0
 fpga/lib/{ => common}/memory_manager.cpp |  0
 fpga/lib/{ => common}/plugin.cpp         |  0
 fpga/lib/{ => common}/utils.cpp          |  0
 6 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 fpga/lib/common/CMakeLists.txt
 rename fpga/lib/{ => common}/memory.cpp (100%)
 rename fpga/lib/{ => common}/memory_manager.cpp (100%)
 rename fpga/lib/{ => common}/plugin.cpp (100%)
 rename fpga/lib/{ => common}/utils.cpp (100%)

diff --git a/fpga/lib/CMakeLists.txt b/fpga/lib/CMakeLists.txt
index 84733d3f8..834a7c856 100644
--- a/fpga/lib/CMakeLists.txt
+++ b/fpga/lib/CMakeLists.txt
@@ -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
diff --git a/fpga/lib/common/CMakeLists.txt b/fpga/lib/common/CMakeLists.txt
new file mode 100644
index 000000000..7b6ba9e27
--- /dev/null
+++ b/fpga/lib/common/CMakeLists.txt
@@ -0,0 +1,13 @@
+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)
diff --git a/fpga/lib/memory.cpp b/fpga/lib/common/memory.cpp
similarity index 100%
rename from fpga/lib/memory.cpp
rename to fpga/lib/common/memory.cpp
diff --git a/fpga/lib/memory_manager.cpp b/fpga/lib/common/memory_manager.cpp
similarity index 100%
rename from fpga/lib/memory_manager.cpp
rename to fpga/lib/common/memory_manager.cpp
diff --git a/fpga/lib/plugin.cpp b/fpga/lib/common/plugin.cpp
similarity index 100%
rename from fpga/lib/plugin.cpp
rename to fpga/lib/common/plugin.cpp
diff --git a/fpga/lib/utils.cpp b/fpga/lib/common/utils.cpp
similarity index 100%
rename from fpga/lib/utils.cpp
rename to fpga/lib/common/utils.cpp

From 1f42f5bb63a81ae6156e84420fd88e19f12aed08 Mon Sep 17 00:00:00 2001
From: Daniel Krebs <github@daniel-krebs.net>
Date: Tue, 15 May 2018 11:50:48 +0200
Subject: [PATCH 2/2] common/cmake: add spdlog include and compatibility
 include (villas/...)

---
 fpga/lib/common/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fpga/lib/common/CMakeLists.txt b/fpga/lib/common/CMakeLists.txt
index 7b6ba9e27..20bb3b6e2 100644
--- a/fpga/lib/common/CMakeLists.txt
+++ b/fpga/lib/common/CMakeLists.txt
@@ -10,4 +10,6 @@ add_library(villas-common SHARED
 
 target_include_directories(villas-common
 	PUBLIC
-	    ${CMAKE_CURRENT_LIST_DIR}/../../include/villas)
+		${CMAKE_CURRENT_LIST_DIR}/../../include/villas
+		${CMAKE_CURRENT_LIST_DIR}/../../include
+		${CMAKE_CURRENT_LIST_DIR}/../../thirdparty/spdlog/include)