Revert "dependencies/cmake: blacklist cmake 3.7"
This reverts commit 4422eca2d4
.
We now have a workaround for the RPATH issue introduced in 3.7, so we
can use it again.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
4d3556662d
commit
6593a0b987
@ -6,9 +6,6 @@ version_min="${2}"
|
||||
major_min="${version_min%.*}"
|
||||
minor_min="${version_min#*.}"
|
||||
|
||||
# cmake-3.7 incorrectly handles rpath, linking to host libraries
|
||||
blacklist_version="3.7"
|
||||
|
||||
cmake=`which ${candidate}`
|
||||
if [ ! -x "${cmake}" ]; then
|
||||
# echo nothing: no suitable cmake found
|
||||
@ -30,11 +27,6 @@ version="$(${cmake} --version \
|
||||
major="${version%.*}"
|
||||
minor="${version#*.}"
|
||||
|
||||
if [ "${version}" = "${blacklist_version}" ]; then
|
||||
# echo nothing: no suitable cmake found
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ${major} -gt ${major_min} ]; then
|
||||
echo "${cmake}"
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user