fsfw/fsfw-example-hosted
fsfw/fsfw-example-hosted
12
1
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

fsfw update and script fix

Browse Source
This commit is contained in:
Robin Müller 2021-07-19 18:30:24 +02:00
parent 7eb4a85d7c
commit 2ab89c5a5c
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -54,6 +54,8 @@ configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h) configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)
configure_file(${FSFW_CONFIG_PATH}/OBSWConfig.h.in OBSWConfig.h) configure_file(${FSFW_CONFIG_PATH}/OBSWConfig.h.in OBSWConfig.h)
set(FSFW_ADD_MONITORING ON)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(WARNING_FLAGS set(WARNING_FLAGS
-Wall -Wall

4
cmake/scripts/Hosted/cmake_release_cfg.sh → cmake/scripts/Hosted/make_releae_cfg.sh
View File

@ -16,7 +16,7 @@ fi
build_generator="" build_generator=""
os_fsfw="host" os_fsfw="host"
builddir="build-Debug" builddir="build-Release"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then
build_generator="MinGW Makefiles" build_generator="MinGW Makefiles"
python="py" python="py"
@ -28,6 +28,6 @@ fi
echo "Running command (without the leading +):" echo "Running command (without the leading +):"
set -x # Print command set -x # Print command
"${python}" cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}" "${python}" cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
# Use this if commands are added which should not be printed # Use this if commands are added which should not be printed
# set +x # set +x

2
fsfw

@ -1 +1 @@
Subproject commit 66a79cb86c061a7113a43a21035f1fdb1e082729 Subproject commit ce93b9220e4bc8002ca1d7608d64403052b8241a