From 14dc8473e296834e6a402413f45921889580f481 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Mon, 21 Mar 2016 13:46:52 +0100 Subject: [PATCH] cmake: fix mrun to handle cmake build structure Signed-off-by: Orit Wasserman --- src/mrun | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mrun b/src/mrun index 977eb24be7b3..df435ba9a1f5 100755 --- a/src/mrun +++ b/src/mrun @@ -5,7 +5,14 @@ root=`dirname $0` run_name=$1 command=$2 +CEPH_BIN=$root +CEPH_CONF_PATH=$root/run/$run_name + +if [ -e CMakeCache.txt ]; then + CEPH_BIN=$PWD/src + CEPH_CONF_PATH=$PWD/run/$run_name +fi shift 2 -$root/$command -c $root/run/$run_name/ceph.conf "$@" +$CEPH_BIN/$command -c $CEPH_CONF_PATH/ceph.conf "$@" -- 2.47.3