]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: fix mrun to handle cmake build structure 8237/head
authorOrit Wasserman <owasserm@redhat.com>
Mon, 21 Mar 2016 12:46:52 +0000 (13:46 +0100)
committerOrit Wasserman <owasserm@redhat.com>
Tue, 22 Mar 2016 08:34:51 +0000 (09:34 +0100)
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/mrun

index 977eb24be7b3008f1e67b69a96bf14e28b0a973d..df435ba9a1f542572169090215fbb012121a3423 100755 (executable)
--- 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 "$@"