From 612376a74964c79af5b4029c650c8add5fd50120 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 28 Sep 2019 22:15:15 +0800 Subject: [PATCH] do_cmake.sh: set WITH_RADOSGW_AMQP_ENDPOINT using ARGS so we can extend ARGS in a more unified way Signed-off-by: Kefu Chai --- do_cmake.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/do_cmake.sh b/do_cmake.sh index 5e54fc4b7fd..569241d6a59 100755 --- a/do_cmake.sh +++ b/do_cmake.sh @@ -27,27 +27,24 @@ if [ -r /etc/os-release ]; then ;; opensuse*|suse|sles) PYBUILD="3" - WITH_RADOSGW_AMQP_ENDPOINT="OFF" + ARGS+=" -DWITH_RADOSGW_AMQP_ENDPOINT=OFF" ;; esac elif [ "$(uname)" == FreeBSD ] ; then PYBUILD="3" - WITH_RADOSGW_AMQP_ENDPOINT="OFF" + ARGS+=" -DWITH_RADOSGW_AMQP_ENDPOINT=OFF" else echo Unknown release exit 1 fi if [[ "$PYBUILD" =~ ^3(\..*)?$ ]] ; then - ARGS="$ARGS -DWITH_PYTHON2=OFF -DWITH_PYTHON3=${PYBUILD} -DMGR_PYTHON_VERSION=${PYBUILD}" + ARGS+=" -DWITH_PYTHON2=OFF -DWITH_PYTHON3=${PYBUILD} -DMGR_PYTHON_VERSION=${PYBUILD}" fi if type ccache > /dev/null 2>&1 ; then echo "enabling ccache" - ARGS="$ARGS -DWITH_CCACHE=ON" -fi -if [ -n "$WITH_RADOSGW_AMQP_ENDPOINT" ] ; then - ARGS="$ARGS -DWITH_RADOSGW_AMQP_ENDPOINT=$WITH_RADOSGW_AMQP_ENDPOINT" + ARGS+=" -DWITH_CCACHE=ON" fi mkdir $BUILD_DIR -- 2.39.5