From 6e9a0ddcf46d8988e96a6aa6de97178625462993 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 16 Aug 2021 11:23:44 +0200
Subject: [PATCH] cmakedefine for OSAL type

---
 CMakeLists.txt     | 37 +++++++++++++++----------------------
 src/fsfw/FSFW.h.in |  5 +++++
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7865300..9a1f7d1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,35 +62,28 @@ endif()
 set(FSFW_OSAL_DEFINITION FSFW_OSAL_HOST)
 
 if(FSFW_OSAL MATCHES host)
-	set(OS_FSFW_NAME "Host")
+    set(OS_FSFW_NAME "Host")
+    set(FSFW_OSAL_HOST ON)
 elseif(FSFW_OSAL MATCHES linux)
-	set(OS_FSFW_NAME "Linux")
-	set(FSFW_OSAL_DEFINITION FSFW_OSAL_LINUX)
+    set(OS_FSFW_NAME "Linux")
+    set(FSFW_OSAL_LINUX ON)
 elseif(FSFW_OSAL MATCHES freertos)
-	set(OS_FSFW_NAME "FreeRTOS")
-	set(FSFW_OSAL_DEFINITION FSFW_OSAL_FREERTOS)
-	target_link_libraries(${LIB_FSFW_NAME} PRIVATE
+    set(OS_FSFW_NAME "FreeRTOS")
+    set(FSFW_OSAL_FREERTOS ON)
+    target_link_libraries(${LIB_FSFW_NAME} PRIVATE
         ${LIB_OS_NAME}
-	)
+    )
 elseif(FSFW_OSAL STREQUAL rtems)
-	set(OS_FSFW_NAME "RTEMS")
-    set(FSFW_OSAL_DEFINITION FSFW_OSAL_RTEMS)
+    set(OS_FSFW_NAME "RTEMS")
+    set(FSFW_OSAL_RTEMS ON)
 else()
-	message(WARNING 
-		"Invalid operating system for FSFW specified! Setting to host.."
-	)
-	set(OS_FSFW_NAME "Host")
-	set(OS_FSFW "host")
+    message(WARNING
+        "Invalid operating system for FSFW specified! Setting to host.."
+    )
+    set(OS_FSFW_NAME "Host")
+    set(OS_FSFW "host")
 endif()
 
-target_compile_definitions(${LIB_FSFW_NAME} PRIVATE
-    ${FSFW_OSAL_DEFINITION}
-)
-
-target_compile_definitions(${LIB_FSFW_NAME} INTERFACE
-    ${FSFW_OSAL_DEFINITION}
-)
-
 message(STATUS "Compiling FSFW for the ${OS_FSFW_NAME} operating system.")
 
 add_subdirectory(src)
diff --git a/src/fsfw/FSFW.h.in b/src/fsfw/FSFW.h.in
index 4d4b8aee..f0eb9365 100644
--- a/src/fsfw/FSFW.h.in
+++ b/src/fsfw/FSFW.h.in
@@ -3,6 +3,11 @@
 
 #include "FSFWConfig.h"
 
+#cmakedefine FSFW_OSAL_RTEMS
+#cmakedefine FSFW_OSAL_FREERTOS
+#cmakedefine FSFW_OSAL_LINUX
+#cmakedefine FSFW_OSAL_HOST
+
 #cmakedefine FSFW_ADD_RMAP
 #cmakedefine FSFW_ADD_DATALINKLAYER
 #cmakedefine FSFW_ADD_TMSTORAGE