restore openRTI -i switch functionality, add additional CMake argument variable

This commit is contained in:
Hamza Alloush 2015-04-13 05:32:20 +03:00
parent d4890af978
commit 4bf8367d3c

View File

@ -43,6 +43,8 @@ DOWNLOAD="y"
JOPTION="" JOPTION=""
OOPTION="" OOPTION=""
DEBUG="" DEBUG=""
SG_CMAKEARGS=""
FG_CMAKEARGE=""
while getopts "shc:p:a:d:r:j:O:i" OPTION; do while getopts "shc:p:a:d:r:j:O:i" OPTION; do
case $OPTION in case $OPTION in
@ -55,6 +57,7 @@ while getopts "shc:p:a:d:r:j:O:i" OPTION; do
r) RECONFIGURE=$OPTARG ;; r) RECONFIGURE=$OPTARG ;;
j) JOPTION=" -j"$OPTARG" " ;; j) JOPTION=" -j"$OPTARG" " ;;
O) OOPTION=" -O"$OPTARG" " ;; O) OOPTION=" -O"$OPTARG" " ;;
i) OPENRTI="OPENRTI" ;;
?) HELP="HELP" ;; ?) HELP="HELP" ;;
esac esac
done done
@ -81,6 +84,13 @@ else
fi fi
if [ "$OPENRTI" = "OPENRTI" ]; then
SG_CMAKEARGS="$SG_CMAKEARGS-DENABLE_RTI=ON;"
FG_CMAKEARGS="$FG_CMAKEARGS-DENABLE_RTI=ON;"
WHATTOBUILD=( "${WHATTOBUILD[@]}" OPENRTI )
fi
#############################################################" #############################################################"
# Some helper for redundant task # Some helper for redundant task
@ -145,6 +155,7 @@ if [ "$HELP" = "HELP" ]; then
echo "Switches:" echo "Switches:"
echo "* -h show this help" echo "* -h show this help"
echo "* -e compile FlightGear with --with-eventinput option (experimental)" echo "* -e compile FlightGear with --with-eventinput option (experimental)"
echo "* -i compile SimGear and FlightGear with -D ENABLE_RTI=ON option (experimental)"
echo "* -g compile with debug info for gcc" echo "* -g compile with debug info for gcc"
echo "* -a y|n y=do an apt-get update n=skip apt-get update default=y" echo "* -a y|n y=do an apt-get update n=skip apt-get update default=y"
echo "* -p y|n y=download packages n=skip download packages default=y" echo "* -p y|n y=download packages n=skip download packages default=y"
@ -295,7 +306,7 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="OPENRTI"' ]]; then
mkdir -p "openrti" mkdir -p "openrti"
cd "$CBD"/openrti cd "$CBD"/openrti
_gitDownload https://gitorious.org/openrti/openrti.git _gitDownload git://git.code.sf.net/p/openrti/OpenRTI
if [ "$STABLE" = "STABLE" ]; then if [ "$STABLE" = "STABLE" ]; then
_gitUpdate release-0.7 _gitUpdate release-0.7