From 8cccd7e53a0a40ee7a71f52c669aad1406b6f504 Mon Sep 17 00:00:00 2001
From: Damiano Amatruda <damiano.amatruda@skywarder.eu>
Date: Wed, 8 Dec 2021 23:10:14 +0100
Subject: [PATCH] [SBS] Check that CMake Toolchain File exists
---
sbs | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sbs b/sbs
index daee658fb..4b04d0437 100755
--- a/sbs
+++ b/sbs
@@ -47,6 +47,7 @@ init_dirs() {
sbs_base="$(cd -- "$(dirname "$0")" > /dev/null 2>&1 && pwd -P)"
source_dir="$PWD"
build_dir="$source_dir/build"
+ toolchain_file="$sbs_base/libs/miosix-kernel/miosix/_tools/toolchain.cmake"
}
find_deps() {
@@ -71,16 +72,15 @@ find_deps() {
|| ([ "$found_stlink" = true ] && echo "st-link" || echo "no")
echo
- if [ "$found_cmake" = false ]; then
- echo "Error: CMake must be installed"
- exit 1
- fi
+ [ "$found_cmake" = true ] || { echo "Error: CMake must be installed"; exit 1; }
}
configure() {
ohai "Configure"
- defs="-DCMAKE_TOOLCHAIN_FILE=$sbs_base/libs/miosix-kernel/miosix/_tools/toolchain.cmake"
+ [ -f "$toolchain_file" ] || { echo "Error: CMake Toolchain File for Miosix was not found"; exit 1; }
+
+ defs="-DCMAKE_TOOLCHAIN_FILE=$toolchain_file"
defs="$defs -DCMAKE_C_FLAGS=-fdiagnostics-color=always -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always"
[ "$found_ccache" = true ] && defs="$defs -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
[ "$config_debug" = true ] && defs="$defs -DCMAKE_BUILD_TYPE=Debug" || defs="$defs -DCMAKE_BUILD_TYPE=Release"
@@ -269,6 +269,7 @@ TTY_RESET="\033[0m"
sbs_base=
source_dir=
build_dir=
+toolchain_file=
found_cmake=false
found_ccache=false
found_ninja=false
--
GitLab