skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

--broken is new and not really needed.

Browse Source
This commit is contained in:
Maarten Billemont 2017-11-06 15:38:30 -05:00
parent 11d9af3844
commit 1841541bc4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform-independent/cli-c/CMakeLists.txt
View File

@ -19,7 +19,7 @@ set( CMAKE_BUILD_TYPE Release )
set( CMAKE_C_FLAGS "-O3" )
# Version.
execute_process( COMMAND git describe --match *-clo* --long --dirty --broken RESULT_VARIABLE status OUTPUT_VARIABLE mpw_version OUTPUT_STRIP_TRAILING_WHITESPACE )
execute_process( COMMAND git describe --match *-clo* --long --dirty RESULT_VARIABLE status OUTPUT_VARIABLE mpw_version OUTPUT_STRIP_TRAILING_WHITESPACE )
if( NOT status EQUAL 0 AND EXISTS "VERSION" )
file( READ "VERSION" mpw_version )
string( STRIP ${mpw_version} mpw_version )

2
platform-independent/cli-c/build
View File

@ -46,7 +46,7 @@ cflags=( -O3 $CFLAGS )
ldflags=( $LDFLAGS )
# Version.
if { mpw_version=$(git describe --match '*-cli*' --long --dirty --broken) || mpw_version=$(<VERSION); } 2>/dev/null; then
if { mpw_version=$(git describe --match '*-cli*' --long --dirty) || mpw_version=$(<VERSION); } 2>/dev/null; then
cflags+=( -D"MP_VERSION=$mpw_version" )
fi
echo 2>&1 "Current mpw source version ${mpw_version:-<unknown>}..."