some more fixes

This commit is contained in:
Robin Müller 2021-07-15 19:06:40 +02:00
parent 3c364604ac
commit d11e54dc0a
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 6 additions and 7 deletions

View File

@ -8,14 +8,9 @@ option(FSFW_HAL_ADD_RASPBERRY_PI "Add Raspberry Pi specific code to the sources"
option(FSFW_HAL_ADD_STM32H7 "Add the STM32H7 HAL to the sources" OFF) option(FSFW_HAL_ADD_STM32H7 "Add the STM32H7 HAL to the sources" OFF)
option(FSFW_HAL_WARNING_SHADOW_LOCAL_GCC "Enable -Wshadow=local warning in GCC" ON) option(FSFW_HAL_WARNING_SHADOW_LOCAL_GCC "Enable -Wshadow=local warning in GCC" ON)
set(LIB_FSFW_HAL_NAME fsfw_hal)
set(LINUX_HAL_PATH_NAME linux) set(LINUX_HAL_PATH_NAME linux)
set(STM32H7_PATH_NAME stm32h7) set(STM32H7_PATH_NAME stm32h7)
if(NOT LIB_FSFW_NAME)
message(ERROR "LIB_FSFW_NAME needs to be set as a linkable target")
endif()
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(inc) add_subdirectory(inc)
@ -35,7 +30,6 @@ foreach(INCLUDE_PATH ${FSFW_HAL_ADDITIONAL_INC_PATHS})
endforeach() endforeach()
target_include_directories(${LIB_FSFW_NAME} PRIVATE target_include_directories(${LIB_FSFW_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
${FSFW_HAL_ADD_INC_PATHS_ABS} ${FSFW_HAL_ADD_INC_PATHS_ABS}
) )

View File

@ -1,4 +1,9 @@
#include <fsfw_hal/linux/utility.h> #include "fsfw/FSFW.h"
#include "fsfw/serviceinterface/ServiceInterface.h"
#include "fsfw/hal/linux/utility.h"
#include <cerrno>
#include <cstring>
void utility::handleIoctlError(const char* const customPrintout) { void utility::handleIoctlError(const char* const customPrintout) {
#if FSFW_VERBOSE_LEVEL >= 1 #if FSFW_VERBOSE_LEVEL >= 1