--broken is new and not really needed.
This commit is contained in:
parent
11d9af3844
commit
1841541bc4
@ -19,7 +19,7 @@ set( CMAKE_BUILD_TYPE Release )
|
|||||||
set( CMAKE_C_FLAGS "-O3" )
|
set( CMAKE_C_FLAGS "-O3" )
|
||||||
|
|
||||||
# Version.
|
# 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" )
|
if( NOT status EQUAL 0 AND EXISTS "VERSION" )
|
||||||
file( READ "VERSION" mpw_version )
|
file( READ "VERSION" mpw_version )
|
||||||
string( STRIP ${mpw_version} mpw_version )
|
string( STRIP ${mpw_version} mpw_version )
|
||||||
|
@ -46,7 +46,7 @@ cflags=( -O3 $CFLAGS )
|
|||||||
ldflags=( $LDFLAGS )
|
ldflags=( $LDFLAGS )
|
||||||
|
|
||||||
# Version.
|
# 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" )
|
cflags+=( -D"MP_VERSION=$mpw_version" )
|
||||||
fi
|
fi
|
||||||
echo 2>&1 "Current mpw source version ${mpw_version:-<unknown>}..."
|
echo 2>&1 "Current mpw source version ${mpw_version:-<unknown>}..."
|
||||||
|
Loading…
Reference in New Issue
Block a user