Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #770 from ennorehling/master 

fix types for CMakeCache
This commit is contained in:
Enno Rehling 2018-02-24 18:20:10 +01:00 committed by GitHub
parent e61cc22c45 c432bcf22e
commit 5990a99ae8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
s/build
View File

@ -37,10 +37,10 @@ BRANCH=$(git status -s -b | head -1 | cut -d\ -f 2 | sed 's/\..*//')
if [ "$BRANCH" = "master" ] ; then if [ "$BRANCH" = "master" ] ; then
VERSION=$(git describe --match 'v*.*.*' --tags | sed 's/^v//') VERSION=$(git describe --match 'v*.*.*' --tags | sed 's/^v//')
echo "$BRANCH $VERSION" echo "$BRANCH $VERSION"
CMAKE_ARGS="-DERESSEA_VERSION=$VERSION ${CMAKE_ARGS}" CMAKE_ARGS="-DERESSEA_VERSION:STRING=$VERSION ${CMAKE_ARGS}"
else else
REV=$(git rev-parse --short HEAD) REV=$(git rev-parse --short HEAD)
CMAKE_ARGS="-DERESSEA_BUILDNO=$REV $CMAKE_ARGS" CMAKE_ARGS="-DERESSEA_BUILDNO:STRING=$REV $CMAKE_ARGS"
fi fi
cmake ${CMAKE_ARGS} cmake ${CMAKE_ARGS}