RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-20 01:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9460 from pritha-srivastava/wip-cmake-vstart

Browse Source 
cmake: detection scripts use lowercase project name

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2016-06-02 11:29:55 -04:00
commit 459d4299f7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ceph.in
View File

@ -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()

2
src/test/detect-build-env-vars.sh
View File

@ -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

2
src/vstart.sh
View File

@ -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