From 8f20e3cc61a53f0a6ab56b6dd68649eaace24071 Mon Sep 17 00:00:00 2001 From: Pritha Date: Thu, 2 Jun 2016 20:37:01 +0530 Subject: [PATCH] cmake: detection scripts use lowercase project name Changing the detection scripts to use the new project name, changed in commit c1a37101ea87a973068f2dc9858487f83ae57f88 (cmake: project name should be "ceph") Signed-off-by: Pritha Srivastava --- src/ceph.in | 2 +- src/test/detect-build-env-vars.sh | 2 +- src/vstart.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ceph.in b/src/ceph.in index cf1210d574b..b404bca05cb 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -88,7 +88,7 @@ elif os.path.exists(os.path.join(os.getcwd(), "CMakeCache.txt")) \ and os.path.exists(os.path.join(os.getcwd(), "bin/init-ceph")): src_path = None for l in open("./CMakeCache.txt").readlines(): - if l.startswith("Ceph_SOURCE_DIR:STATIC="): + if l.startswith("ceph_SOURCE_DIR:STATIC="): src_path = l.split("=")[1].strip() diff --git a/src/test/detect-build-env-vars.sh b/src/test/detect-build-env-vars.sh index 83bcc869c0b..3f665c7be8a 100644 --- a/src/test/detect-build-env-vars.sh +++ b/src/test/detect-build-env-vars.sh @@ -5,7 +5,7 @@ if [ -n "$CEPH_BUILD_DIR" ] && [ -n "$CEPH_ROOT" ] && [ -n "$CEPH_BIN" ] && [ -n elif [ -e CMakeCache.txt ]; then echo "Environment Variables Not All Set, Detected Build System CMake" echo "Setting Environment Variables" - export CEPH_ROOT=`grep Ceph_SOURCE_DIR CMakeCache.txt | cut -d "=" -f 2` + export CEPH_ROOT=`grep ceph_SOURCE_DIR CMakeCache.txt | cut -d "=" -f 2` export CEPH_BUILD_DIR=`pwd` export CEPH_BIN=$CEPH_BUILD_DIR/bin export CEPH_LIB=$CEPH_BUILD_DIR/lib diff --git a/src/vstart.sh b/src/vstart.sh index a849184a5fe..e48f4e9e0c1 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -24,7 +24,7 @@ fi # 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=`grep ceph_SOURCE_DIR CMakeCache.txt | cut -d "=" -f 2` CEPH_BUILD_DIR=`pwd` fi