From 5927d944de61672a16afc366d0ebec10f46e19c2 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Sat, 12 Dec 2020 18:32:24 +0100
Subject: [PATCH] cmake fixes

---
 CMakeLists.txt                | 2 ++
 datapool/CMakeLists.txt       | 7 +------
 datapoollocal/CMakeLists.txt  | 8 ++++++++
 events/CMakeLists.txt         | 1 -
 housekeeping/CMakeLists.txt   | 5 +++++
 storagemanager/CMakeLists.txt | 2 ++
 thermal/CMakeLists.txt        | 4 ++--
 7 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 datapoollocal/CMakeLists.txt
 create mode 100644 housekeeping/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 669283c7..09760f8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,8 @@ add_subdirectory(controller)
 add_subdirectory(coordinates)
 add_subdirectory(datalinklayer)
 add_subdirectory(datapool)
+add_subdirectory(datapoollocal)
+add_subdirectory(housekeeping)
 add_subdirectory(devicehandlers)
 add_subdirectory(events)
 add_subdirectory(fdir)
diff --git a/datapool/CMakeLists.txt b/datapool/CMakeLists.txt
index e741f6a1..0d53e1ba 100644
--- a/datapool/CMakeLists.txt
+++ b/datapool/CMakeLists.txt
@@ -1,11 +1,6 @@
 target_sources(${LIB_FSFW_NAME} 
 	PRIVATE 
-		ControllerSet.cpp
-		DataPool.cpp
-		DataPoolAdmin.cpp
-		DataPoolParameterWrapper.cpp
-		DataSet.cpp
 		HkSwitchHelper.cpp
+		PoolDataSetBase.cpp
 		PoolEntry.cpp
-		PoolRawAccess.cpp
 )
\ No newline at end of file
diff --git a/datapoollocal/CMakeLists.txt b/datapoollocal/CMakeLists.txt
new file mode 100644
index 00000000..c6b187cd
--- /dev/null
+++ b/datapoollocal/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		LocalDataPoolManager.cpp
+		LocalDataSet.cpp
+		LocalPoolDataSetBase.cpp
+		LocalPoolObjectBase.cpp
+		SharedLocalDataSet.cpp
+)
\ No newline at end of file
diff --git a/events/CMakeLists.txt b/events/CMakeLists.txt
index 9e63deb8..4e935167 100644
--- a/events/CMakeLists.txt
+++ b/events/CMakeLists.txt
@@ -1,6 +1,5 @@
 target_sources(${LIB_FSFW_NAME} 
 	PRIVATE 
-		Event.cpp
 		EventManager.cpp
 		EventMessage.cpp
 )
diff --git a/housekeeping/CMakeLists.txt b/housekeeping/CMakeLists.txt
new file mode 100644
index 00000000..fecad2e3
--- /dev/null
+++ b/housekeeping/CMakeLists.txt
@@ -0,0 +1,5 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		HousekeepingMessage.cpp
+		PeriodicHousekeepingHelper.cpp
+)
\ No newline at end of file
diff --git a/storagemanager/CMakeLists.txt b/storagemanager/CMakeLists.txt
index 57c92195..b8138cae 100644
--- a/storagemanager/CMakeLists.txt
+++ b/storagemanager/CMakeLists.txt
@@ -2,4 +2,6 @@ target_sources(${LIB_FSFW_NAME}
 	PRIVATE 
 		ConstStorageAccessor.cpp
 		StorageAccessor.cpp
+		LocalPool.cpp
+		PoolManager.cpp
 )
\ No newline at end of file
diff --git a/thermal/CMakeLists.txt b/thermal/CMakeLists.txt
index 67664fbe..ad532721 100644
--- a/thermal/CMakeLists.txt
+++ b/thermal/CMakeLists.txt
@@ -1,10 +1,10 @@
 target_sources(${LIB_FSFW_NAME} 
 	PRIVATE 
 		AbstractTemperatureSensor.cpp
-		CoreComponent.cpp
 		Heater.cpp
 		RedundantHeater.cpp
+		ThermalComponentCore.cpp
 		ThermalComponent.cpp
 		ThermalModule.cpp
-		ThermalMonitor.cpp
+		ThermalMonitorReporter.cpp
 )