From: Kefu Chai Date: Thu, 8 Feb 2018 04:04:08 +0000 (+0800) Subject: vstart.sh: introduce get_cmake_variable() X-Git-Tag: v13.0.2~257^2~8 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3b58a1c18ccc27e0d363b86dfeb714e06eb0f77a;p=ceph.git vstart.sh: introduce get_cmake_variable() Signed-off-by: Kefu Chai --- diff --git a/src/vstart.sh b/src/vstart.sh index ba2e87f888711..33010abb81cb1 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -16,10 +16,15 @@ if [ -n "$VSTART_DEST" ]; then CEPH_OUT_DIR=$VSTART_DEST/out fi +get_cmake_variable() { + local variable=$1 + grep "$variable" CMakeCache.txt | cut -d "=" -f 2 +} + # for running out of the CMake build directory if [ -e CMakeCache.txt ]; then # Out of tree build, learn source location from CMakeCache.txt - CEPH_ROOT=`grep ceph_SOURCE_DIR CMakeCache.txt | cut -d "=" -f 2` + CEPH_ROOT=$(get_cmake_variable ceph_SOURCE_DIR) CEPH_BUILD_DIR=`pwd` [ -z "$MGR_PYTHON_PATH" ] && MGR_PYTHON_PATH=$CEPH_ROOT/src/pybind/mgr fi