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

v1.11.0 #243

Merged
muellerr merged 159 commits from develop into main 2022-05-04 17:19:57 +02:00
Conversation 0 Commits 159 Files Changed 144 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 79aac89f36 - Show all commits

5
CMakeLists.txt
View File

@ -25,8 +25,10 @@ if(NOT FSFW_OSAL)
endif() endif()
if(TGT_BSP) if(TGT_BSP)
if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack") if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
option(LINUX_CROSS_COMPILE ON) option(LINUX_CROSS_COMPILE ON)
endif()
if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
option(EIVE_BUILD_GPSD_GPS_HANDLER "Build GPSD dependent GPS Handler" OFF) option(EIVE_BUILD_GPSD_GPS_HANDLER "Build GPSD dependent GPS Handler" OFF)
elseif(TGT_BSP MATCHES "arm/q7s") elseif(TGT_BSP MATCHES "arm/q7s")
option(EIVE_Q7S_EM "Build configuration for the EM" OFF) option(EIVE_Q7S_EM "Build configuration for the EM" OFF)
@ -296,6 +298,7 @@ target_include_directories(${WATCHDOG_NAME} PUBLIC
) )
# unittests # unittests
f(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL) add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL)
if(EIVE_ADD_ETL_LIB) if(EIVE_ADD_ETL_LIB)

4
README.md
View File

@ -209,7 +209,7 @@ You can also use the FSFW OSAL `host` to build on Windows or for generic OSes.
Note: Currently this is not supported. Note: Currently this is not supported.
```sh ```sh
mkdir build-Debug-Host && cd build-Debug-Host mkdir cmake-build-debug && cd cmake-build-debug
cmake -DFSFW_OSAL=host -DCMAKE_BUILD_TYPE=Debug .. cmake -DFSFW_OSAL=host -DCMAKE_BUILD_TYPE=Debug ..
cmake --build . -j cmake --build . -j
``` ```
@ -220,7 +220,7 @@ To build the unittests, the corresponding target must be specified in the build
The configure steps do not need to be repeated if the folder has already been configured. The configure steps do not need to be repeated if the folder has already been configured.
```sh ```sh
mkdir build-Debug-Unittest && cd build-Debug-Unittest mkdir cmake-build-debug && cd cmake-build-debug
cmake .. cmake ..
cmake --build . --target eive-unittests -j cmake --build . --target eive-unittests -j
``` ```