Reworked cmake #136

mohr · 2022-02-10T16:07:29+01:00

mohr commented

2022-02-10 16:07:29 +01:00

Changes:

Default FSFW OSAL is now linux (host does not build atm)
mission is a library target now, in preparation for unit tests, which need their own main()
eive-simple was moved into bsp_q7s and as such is only available for TGT_BSP=arm/q7s
watchdog and simple are their own targets. These two targets are not included in the default (in make language "all") target but must be specified separately. In make make eive-watchdog, in ninja ninja eive-watchdog, in cmake cmake --build . --target eive-watchdog
some commands were moved from top level CMakeLists.txt into bsp_q7s, to flatten if-hierarchiy
Compiler and Linker options are applied globally, so they do not need to be specified for each target
Removed scripts to generate config for watchdog and simple, the are not needed any more as both are now individual targets of the same configuration
Updated README to reflect changes
Tried to get simple to compile but stopped after talking to Robin.

I verified that built files as well as compiler options are identical.
While the watchdog builds with identical size, the obsw does not (by some 100 Bytes), but I guess that is caused by minor changes in include order and/or due to mission being linked as library (which slightly changes which code is linked in). As all files are compiled the same I assume the resulting binary is functionally equivalent.

Changes: * Default FSFW OSAL is now linux (host does not build atm) * `mission` is a library target now, in preparation for unit tests, which need their own `main()` * `eive-simple` was moved into `bsp_q7s` and as such is only available for `TGT_BSP=arm/q7s` * watchdog and simple are their own targets. These two targets are not included in the default (in make language "all") target but must be specified separately. In make `make eive-watchdog`, in ninja `ninja eive-watchdog`, in cmake `cmake --build . --target eive-watchdog` * some commands were moved from top level `CMakeLists.txt` into `bsp_q7s`, to flatten if-hierarchiy * Compiler and Linker options are applied globally, so they do not need to be specified for each target * Removed scripts to generate config for `watchdog` and `simple`, the are not needed any more as both are now individual targets of the same configuration * Updated README to reflect changes * Tried to get `simple` to compile but stopped after talking to Robin. I verified that built files as well as compiler options are identical. While the watchdog builds with identical size, the obsw does not (by some 100 Bytes), but I guess that is caused by minor changes in include order and/or due to mission being linked as library (which slightly changes which code is linked in). As all files are compiled the same I assume the resulting binary is functionally equivalent.

mohr added 3 commits 2022-02-10 16:07:33 +01:00

EIVE/eive-obsw/pipeline/head This commit looks good Details

4d154b7cee reworked cmake, unfortunately a big one due to interdependence

- /mission is a library now, in preparation of unittests (which bring their own main)
- eive-simple is now only available in bsp=arm/q7s (but is still not compiling)
- watchdog and simple are their own executables, not configurations any more
- moved some q7s specific code into /bsp-q7s to flatten if-hierarchy in main CMakeLists.txt
- compiler and linker options are not globally applied to all targets
- linux is the default fsfw osal now, as current code does not compile on hosted

00042af77c updated README to cmake changes

EIVE/eive-obsw/pipeline/head This commit looks good Details

EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details

e59a98f11c removed q7s/watchdog and q7s/simple configurations scripts, as there is no special configuration needed any more

mohr changed title from ~~Reworked cmake~~ to WIP: Reworked cmake

2022-02-10 16:08:37 +01:00

mohr force-pushed mohr/cmake from 59b3d4f68d to 50cf01376f

2022-02-10 16:22:59 +01:00

Compare

mohr changed title from ~~WIP: Reworked cmake~~ to Reworked cmake

2022-02-10 16:27:20 +01:00

mohr requested review from muellerr 2022-02-10 16:28:00 +01:00