Merge remote-tracking branch 'origin/develop' into mueller/master

2022-02-15 16:54:08 +01:00
parent c6c9a02f09 3a6dcdc78e
commit 41b029f12b
43 changed files with 217 additions and 395 deletions
--- a/bsp_q7s/core/CMakeLists.txt
+++ b/bsp_q7s/core/CMakeLists.txt
@ -1,6 +1,10 @@
-target_sources(${TARGET_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE
    CoreController.cpp
    obsw.cpp
    InitMission.cpp
    ObjectFactory.cpp
 )
+
+target_sources(${SIMPLE_OBSW_NAME} PRIVATE
+    InitMission.cpp
+)