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

CMake git describe support #226

Merged
meierj merged 7 commits from mueller/cmake-git-describe-support into develop 2022-04-22 20:03:34 +02:00
Conversation 1 Commits 7 Files Changed 16 +515 -124
16 changed files with 515 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 417a6d8ea0 - Show all commits

2
cmake/PreProjectConfig.cmake
View File

@ -89,7 +89,7 @@ endif()
if(FSFW_OSAL MATCHES linux AND TGT_BSP AND EIVE_HARDCODED_TOOLCHAIN_FILE)
if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/te0720-1cfa")
set(CMAKE_TOOLCHAIN_FILE
${CMAKE_CURRENT_SOURCE_DIR}/cmake/Zynq7020CrossCompileConfig.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Zynq7020CrossCompileConfig.cmake"
PARENT_SCOPE
)
elseif(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/egse")

2
fsfw

Submodule fsfw updated: 707a43aba9...24ef96d1b8