From 435c6e641021ce450ba88b1cb57c960a5548f784 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Tue, 30 Mar 2021 00:37:10 +0200
Subject: [PATCH] bugfix for linux/host
---
osal/CMakeLists.txt | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/osal/CMakeLists.txt b/osal/CMakeLists.txt
index 6cda0c88..76b939b1 100644
--- a/osal/CMakeLists.txt
+++ b/osal/CMakeLists.txt
@@ -1,30 +1,34 @@
# Check the OS_FSFW variable
if(${OS_FSFW} STREQUAL "freertos")
- add_subdirectory(FreeRTOS)
+ add_subdirectory(FreeRTOS)
elseif(${OS_FSFW} STREQUAL "rtems")
- add_subdirectory(rtems)
+ add_subdirectory(rtems)
elseif(${OS_FSFW} STREQUAL "linux")
- add_subdirectory(linux)
+ add_subdirectory(linux)
elseif(${OS_FSFW} STREQUAL "host")
- add_subdirectory(host)
- if (WIN32)
- add_subdirectory(windows)
- elseif(UNIX)
- endif ()
+ add_subdirectory(host)
+ if (WIN32)
+ add_subdirectory(windows)
+ elseif(UNIX)
+ # We still need to pull in some Linux specific sources
+ target_sources(${LIB_FSFW_NAME} PUBLIC
+ linux/tcpipHelpers.cpp
+ )
+ endif ()
else()
- message(WARNING "The OS_FSFW variable was not set. Assuming host OS..")
- # Not set. Assumuing this is a host build, try to determine host OS
- if (WIN32)
- add_subdirectory(host)
- add_subdirectory(windows)
- elseif (UNIX)
- add_subdirectory(linux)
- else ()
- # MacOS or other OSes have not been tested yet / are not supported.
- message(FATAL_ERROR "The host OS could not be determined! Aborting.")
- endif()
+ message(WARNING "The OS_FSFW variable was not set. Assuming host OS..")
+ # Not set. Assumuing this is a host build, try to determine host OS
+ if (WIN32)
+ add_subdirectory(host)
+ add_subdirectory(windows)
+ elseif (UNIX)
+ add_subdirectory(linux)
+ else ()
+ # MacOS or other OSes have not been tested yet / are not supported.
+ message(FATAL_ERROR "The host OS could not be determined! Aborting.")
+ endif()
endif()