updated build scripts

cmake/scripts/Host/make-debug-cfg.sh

@@ -15,7 +15,7 @@ if [ "${counter}" -ge 5 ];then
     exit 1
 fi
 
-build_generator="Unix Makefiles"
+build_generator="make"
 os_fsfw="host"
 builddir="build-Debug-Host"
 if [ "${OS}" = "Windows_NT" ]; then

cmake/scripts/Host/make-release-cfg.sh

@@ -15,7 +15,7 @@ if [ "${counter}" -ge 5 ];then
     exit 1
 fi
 
-build_generator="Unix Makefiles"
+build_generator="make"
 os_fsfw="host"
 builddir="build-Release-Host"
 if [ "${OS}" = "Windows_NT" ]; then

cmake/scripts/Host/ninja-debug-cfg.sh

@@ -15,7 +15,7 @@ if [ "${counter}" -ge 5 ];then
     exit 1
 fi
 
-build_generator="Ninja"
+build_generator="ninja"
 os_fsfw="host"
 builddir="build-Debug-Host"
 if [ "${OS}" = "Windows_NT" ]; then

cmake/scripts/Linux/make-debug-cfg.sh

@@ -15,7 +15,7 @@ if [ "${counter}" -ge 5 ];then
     exit 1
 fi
 
-build_generator="Unix Makefiles"
+build_generator="make"
 os_fsfw="linux"
 builddir="build-Debug-Host"
 if [ "${OS}" = "Windows_NT" ]; then

cmake/scripts/Linux/ninja-debug-cfg.sh

@@ -15,7 +15,7 @@ if [ "${counter}" -ge 5 ];then
     exit 1
 fi
 
-build_generator="Ninja"
+build_generator="ninja"
 os_fsfw="linux"
 builddir="build-Debug-Host"
 if [ "${OS}" = "Windows_NT" ]; then

cmake/scripts/Q7S/make-debug-cfg.sh

@@ -18,13 +18,11 @@ fi
 os_fsfw="linux"
 tgt_bsp="arm/q7s"
 build_dir="build-Debug-Q7S"
-build_generator=""
+build_generator="make"
 if [ "${OS}" = "Windows_NT" ]; then
-	build_generator="MinGW Makefiles"
     python="py"
 # Could be other OS but this works for now.
 else
-	build_generator="Unix Makefiles"
     python="python3"
 fi
 

cmake/scripts/Q7S/make-release-cfg.sh

@@ -18,13 +18,11 @@ fi
 os_fsfw="linux"
 tgt_bsp="arm/q7s"
 build_dir="build-Debug-Q7S"
-build_generator=""
+build_generator="make"
 if [ "${OS}" = "Windows_NT" ]; then
-	build_generator="MinGW Makefiles"
     python="py"
 # Could be other OS but this works for now.
 else
-	build_generator="Unix Makefiles"
     python="python3"
 fi
 

cmake/scripts/Q7S/ninja-debug-cfg.sh

@@ -18,7 +18,7 @@ fi
 os_fsfw="linux"
 tgt_bsp="arm/q7s"
 build_dir="build-Debug-Q7S"
-build_generator="Ninja"
+build_generator="ninja"
 if [ "${OS}" = "Windows_NT" ]; then
     python="py"
 # Could be other OS but this works for now.

cmake/scripts/Q7S/ninja-release-cfg.sh

@@ -18,7 +18,7 @@ fi
 os_fsfw="linux"
 tgt_bsp="arm/q7s"
 build_dir="build-Release-Q7S"
-build_generator="Ninja"
+build_generator="ninja"
 if [ "${OS}" = "Windows_NT" ]; then
     python="py"
 # Could be other OS but this works for now.

cmake/scripts/RPi/make-debug-cfg.sh

@@ -18,14 +18,12 @@ fi
 
 os_fsfw="linux"
 tgt_bsp="arm/raspberrypi"
-build_generator=""
+build_generator="make"
 build_dir="build-Debug-RPi"
 if [ "${OS}" = "Windows_NT" ]; then
-	build_generator="MinGW Makefiles"
     python="py"
 # Could be other OS but this works for now.
 else
-	build_generator="Unix Makefiles"
     python="python3"
 fi
 

cmake/scripts/RPi/ninja-debug-cfg.sh

@@ -17,7 +17,7 @@ fi
 
 os_fsfw="linux"
 tgt_bsp="arm/raspberrypi"
-build_generator="Ninja"
+build_generator="ninja"
 build_dir="build-Debug-RPi"
 if [ "${OS}" = "Windows_NT" ]; then
     python="py"

cmake/scripts/cmake-build-cfg.py

@@ -29,7 +29,9 @@ def main():
              "Information)", default="debug"
     )
     parser.add_argument("-l", "--builddir", type=str, help="Specify build directory.")
-    parser.add_argument("-g", "--generator", type=str, help="CMake Generator")
+    parser.add_argument(
+        "-g", "--generator", type=str, help="CMake Generator", choices=['make', 'ninja']
+    )
     parser.add_argument(
         "-d", "--defines",
         help="Additional custom defines passed to CMake (supply without -D prefix!)",
@@ -56,7 +58,15 @@ def main():
     if args.generator is None:
         generator_cmake_arg = ""
     else:
-        generator_cmake_arg = f"-G \"{args.generator}\""
+        if args.generator == 'make':
+            if os.name == 'nt':
+                generator_cmake_arg = '-G "MinGW Makefiles"'
+            else:
+                generator_cmake_arg = '-G "Unix Makefiles"'
+        elif args.generator == 'ninja':
+            generator_cmake_arg = '-G Ninja'
+        else:
+            generator_cmake_arg = args.generator
 
     if args.buildtype == "debug":
         cmake_build_type = "Debug"