From 1841541bc45fd85d848fdc666d0a8c788b45bd9b Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Mon, 6 Nov 2017 15:38:30 -0500 Subject: [PATCH] --broken is new and not really needed. --- platform-independent/cli-c/CMakeLists.txt | 2 +- platform-independent/cli-c/build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform-independent/cli-c/CMakeLists.txt b/platform-independent/cli-c/CMakeLists.txt index acccad99..ae9b9da4 100644 --- a/platform-independent/cli-c/CMakeLists.txt +++ b/platform-independent/cli-c/CMakeLists.txt @@ -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 ) diff --git a/platform-independent/cli-c/build b/platform-independent/cli-c/build index cb6c7ee4..52aff2ea 100755 --- a/platform-independent/cli-c/build +++ b/platform-independent/cli-c/build @@ -46,7 +46,7 @@ cflags=( -O3 $CFLAGS ) ldflags=( $LDFLAGS ) # Version. -if { mpw_version=$(git describe --match '*-cli*' --long --dirty --broken) || mpw_version=$(/dev/null; then +if { mpw_version=$(git describe --match '*-cli*' --long --dirty) || mpw_version=$(/dev/null; then cflags+=( -D"MP_VERSION=$mpw_version" ) fi echo 2>&1 "Current mpw source version ${mpw_version:-}..."