fly/fgmeta
1
0
Fork 0
Code Activity

download_and_compile.sh: fix "TERRAGEAR depends on SIMGEAR" implementation

Browse source 
The previous commit enforced this dependency only under the
[[ "$DOWNLOAD_PACKAGES" = "y" ]] condition, which was too restrictive.
This commit is contained in:
Florent Rougon 2019-04-26 09:25:59 +02:00
parent 5b6ba959d9
commit 92f566f1d3
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
download_and_compile.sh
View file

@ -590,6 +590,20 @@ _logSep
####################################################### #######################################################
####################################################### #######################################################
# ****************************************************************************
# * Inter-component Dependencies *
# ****************************************************************************
# TerraGear requires SimGear
if _elementIn "TERRAGEAR" "${WHATTOBUILD[@]}" && \
! _elementIn "SIMGEAR" "${WHATTOBUILD[@]}"; then
WHATTOBUILD+=(SIMGEAR)
fi
# ****************************************************************************
# * Component dependencies on distribution packages *
# ****************************************************************************
if [[ "$DOWNLOAD_PACKAGES" = "y" ]]; then if [[ "$DOWNLOAD_PACKAGES" = "y" ]]; then
if [[ "$APT_GET_UPDATE" = "y" ]]; then if [[ "$APT_GET_UPDATE" = "y" ]]; then
_aptUpdate _aptUpdate
@ -615,10 +629,6 @@ if [[ "$DOWNLOAD_PACKAGES" = "y" ]]; then
# TerraGear # TerraGear
if _elementIn "TERRAGEAR" "${WHATTOBUILD[@]}"; then if _elementIn "TERRAGEAR" "${WHATTOBUILD[@]}"; then
# Require SimGear
if ! _elementIn "SIMGEAR" "${WHATTOBUILD[@]}"; then
WHATTOBUILD+=(SIMGEAR)
fi
PKG+=(libboost-dev libcgal-dev libgdal-dev libtiff5-dev zlib1g-dev) PKG+=(libboost-dev libcgal-dev libgdal-dev libtiff5-dev zlib1g-dev)
fi fi