X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Keyboards%2Fcmake.bash;h=9587abe062a1daef7e6cb93ef606d79bc4664b1c;hb=0e6f107ea108bea0b179bcc2a2ac17d3ba49e1a7;hp=91425261de27434517e2e5f77593194ba86063e2;hpb=85586c574ac72a160593e7675aa9029d9b2a6713;p=kiibohd-controller.git diff --git a/Keyboards/cmake.bash b/Keyboards/cmake.bash index 9142526..9587abe 100644 --- a/Keyboards/cmake.bash +++ b/Keyboards/cmake.bash @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This is bash lib file for the convenience build scripts # Don't call this script directly # Jacob Alexander 2015 @@ -82,7 +82,18 @@ done mkdir -p "${BuildPath}" cd "${BuildPath}" cmake -DCHIP="${Chip}" -DCOMPILER="${Compiler}" -DScanModule="${ScanModule}" -DMacroModule="${MacroModule}" -DOutputModule="${OutputModule}" -DDebugModule="${DebugModule}" -DBaseMap="${BaseMap}" -DDefaultMap="${DefaultMap}" -DPartialMaps="${PartialMapsExpanded}" "${CMakeListsPath}" +return_code=$? +if [ $return_code != 0 ] ; then + echo "Error in cmake. Exiting..." + exit $return_code +fi + make +return_code=$? +if [ $return_code != 0 ] ; then + echo "Error in make. Exiting..." + exit $return_code +fi echo "Firmware has been compiled into: '${BuildPath}'" cd -