Commit 5d0fea32 authored by Raphael Defosseux's avatar Raphael Defosseux

[DOCKER][RHEL8] fix cmake3 hardcoded calls

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 765c0f42
...@@ -285,7 +285,7 @@ check_install_amf_deps(){ ...@@ -285,7 +285,7 @@ check_install_amf_deps(){
automake \ automake \
bison \ bison \
build-essential \ build-essential \
cmake \ $CMAKE \
daemon \ daemon \
doxygen \ doxygen \
flex \ flex \
......
...@@ -49,6 +49,7 @@ install_fb_folly_from_source(){ ...@@ -49,6 +49,7 @@ install_fb_folly_from_source(){
then then
if [[ "$OS_BASEDISTRO" == "fedora" ]]; then if [[ "$OS_BASEDISTRO" == "fedora" ]]; then
$SUDO $INSTALLER install $OPTION \ $SUDO $INSTALLER install $OPTION \
$CMAKE \
boost-devel \ boost-devel \
libevent-devel \ libevent-devel \
double-conversion-devel \ double-conversion-devel \
...@@ -63,6 +64,7 @@ install_fb_folly_from_source(){ ...@@ -63,6 +64,7 @@ install_fb_folly_from_source(){
ret=$?;[[ $ret -ne 0 ]] && return $ret ret=$?;[[ $ret -ne 0 ]] && return $ret
elif [[ $OS_DISTRO == "ubuntu" ]]; then elif [[ $OS_DISTRO == "ubuntu" ]]; then
$SUDO $INSTALLER install $OPTION \ $SUDO $INSTALLER install $OPTION \
$CMAKE \
g++ \ g++ \
libevent-dev \ libevent-dev \
libdouble-conversion-dev \ libdouble-conversion-dev \
...@@ -126,11 +128,7 @@ install_fb_folly_from_source(){ ...@@ -126,11 +128,7 @@ install_fb_folly_from_source(){
git checkout -f v2019.11.11.00 git checkout -f v2019.11.11.00
fi fi
mkdir _build && cd _build mkdir _build && cd _build
if [[ "$OS_BASEDISTRO" == "fedora" ]]; then $CMAKE ..
cmake3 ..
else
cmake ..
fi
ret=$?;[[ $ret -ne 0 ]] && popd && return $ret ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
make -j $(nproc) make -j $(nproc)
ret=$?;[[ $ret -ne 0 ]] && popd && return $ret ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment