fly/fgmeta
1
0
Fork 0
Code Activity

download_and_compile.sh: don't install CMake from distro package when we build it

Browse source 
Don't install the 'cmake' distro package when the CMAKE component has
been selected.
This commit is contained in:
Florent Rougon 2019-04-09 10:29:07 +02:00
parent 6661d1e10c
commit 06d84d1d5b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download_and_compile.sh
View file

@ -601,13 +601,15 @@ if [[ "$DOWNLOAD_PACKAGES" = "y" ]]; then
fi fi
# Minimum # Minimum
PKG=(build-essential cmake git) PKG=(build-essential git)
_mandatory_pkg_alternative libcurl4-openssl-dev libcurl4-gnutls-dev _mandatory_pkg_alternative libcurl4-openssl-dev libcurl4-gnutls-dev
# CMake # CMake
if _elementIn "CMAKE" "${WHATTOBUILD[@]}"; then if _elementIn "CMAKE" "${WHATTOBUILD[@]}"; then
PKG+=(libarchive-dev libbz2-dev libexpat1-dev libjsoncpp-dev liblzma-dev PKG+=(libarchive-dev libbz2-dev libexpat1-dev libjsoncpp-dev liblzma-dev
libncurses5-dev procps zlib1g-dev) libncurses5-dev procps zlib1g-dev)
else
PKG+=(cmake)
fi fi
# TerraGear # TerraGear