KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

some more corrections

Browse Source
This commit is contained in:
Robin Müller 2021-07-13 18:53:07 +02:00
parent f14d5edf42
commit eee84f9318
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -16,7 +16,7 @@ option(FSFW_USE_DATALINKLAYER "Compile with Data Link Layer" ON)
set(LIB_FSFW_NAME fsfw) set(LIB_FSFW_NAME fsfw)
add_library(${LIB_FSFW_NAME}) add_library(${LIB_FSFW_NAME})
set_property(CACHE OS_FSFW PROPERTY STRINGS host linux rtems freertos) set_property(CACHE FSFW_OSAL PROPERTY STRINGS host linux rtems freertos)
if(NOT CMAKE_CXX_STANDARD) if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
@ -25,16 +25,16 @@ elseif(${CMAKE_CXX_STANDARD} LESS 11)
message(FATAL_ERROR "Compiling the FSFW requires a minimum of C++11 support") message(FATAL_ERROR "Compiling the FSFW requires a minimum of C++11 support")
endif() endif()
if(NOT OS_FSFW) if(NOT FSFW_OSAL)
message(STATUS "No OS for FSFW via OS_FSFW set. Assuming host OS") message(STATUS "No OS for FSFW via FSFW_OSAL set. Assuming host OS")
# Assume host OS and autodetermine from OS_FSFW # Assume host OS and autodetermine from OS_FSFW
if(UNIX) if(UNIX)
set(OS_FSFW "linux" set(FSFW_OSAL "linux"
CACHE STRING CACHE STRING
"OS abstraction layer used in the FSFW" "OS abstraction layer used in the FSFW"
) )
elseif(WIN32) elseif(WIN32)
set(OS_FSFW "host" set(FSFW_OSAL "host"
CACHE STRING "OS abstraction layer used in the FSFW" CACHE STRING "OS abstraction layer used in the FSFW"
) )
endif() endif()