eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Update to v1.1.0 #29

Merged
muellerr merged 427 commits from develop into master 2021-04-25 12:43:23 +02:00
Conversation 0 Commits 427 Files Changed 381 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c6e145f17d - Show all commits

16
CMakeLists.txt
View File

@ -55,15 +55,15 @@ include (${CMAKE_SCRIPT_PATH}/HardwareOsPreConfig.cmake)
pre_source_hw_os_config() pre_source_hw_os_config()
if(TGT_BSP) if(TGT_BSP)
if(${TGT_BSP} MATCHES "arm/q7s" OR ${TGT_BSP} MATCHES "arm/raspberrypi") if(${TGT_BSP} MATCHES "arm/q7s" OR ${TGT_BSP} MATCHES "arm/raspberrypi")
set(ROOT_CONFIG_FOLDER TRUE) set(ROOT_CONFIG_FOLDER TRUE)
set(FSFW_CONFIG_PATH "fsfwconfig") set(FSFW_CONFIG_PATH "fsfwconfig")
set(ADD_LINUX_FILES TRUE) set(ADD_LINUX_FILES TRUE)
set(ADD_CSP_LIB TRUE) set(ADD_CSP_LIB TRUE)
endif() endif()
else() else()
# Required by FSFW library # Required by FSFW library
set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig") set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
endif() endif()
################################################################################ ################################################################################
@ -75,11 +75,11 @@ add_executable(${TARGET_NAME})
# Add subdirectories # Add subdirectories
if(ROOT_CONFIG_FOLDER) if(ROOT_CONFIG_FOLDER)
add_subdirectory(${FSFW_CONFIG_PATH}) add_subdirectory(${FSFW_CONFIG_PATH})
endif() endif()
if(ADD_CSP_LIB) if(ADD_CSP_LIB)
add_subdirectory(${CSPLIB_PATH}) add_subdirectory(${CSPLIB_PATH})
endif() endif()
if(ADD_LINUX_FILES) if(ADD_LINUX_FILES)