From 4a4bf82246731a8caad73001084a7891a20ff22a Mon Sep 17 00:00:00 2001 From: Philip Rinn Date: Wed, 22 Oct 2014 18:18:31 +0200 Subject: [PATCH] CACHE_NAME_SUFFIX might be empty for releases. --- tools/generateReleaseInfo | 5 +---- tools/generateReleaseInfo.bat | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/generateReleaseInfo b/tools/generateReleaseInfo index c53ac1fb4..4b3d8f427 100755 --- a/tools/generateReleaseInfo +++ b/tools/generateReleaseInfo @@ -7,8 +7,5 @@ hgChangeset="`hg parents --template '{node|short}'`" echo "set(HG_BRANCH $hgBranch) set(HG_VERSION $hgLatesttag.$hgLatesttagdistance) set(HG_CHANGESET $hgChangeset) -set(HG_TAGDISTANCE $hgLatesttagdistance) -if (CACHE_NAME_SUFFIX STREQUAL \"\") - set(CACHE_NAME_SUFFIX $hgLatesttag) -endif()" > ReleaseInfo.cmake +set(HG_TAGDISTANCE $hgLatesttagdistance)" > ReleaseInfo.cmake diff --git a/tools/generateReleaseInfo.bat b/tools/generateReleaseInfo.bat index 1f0e21d70..a8ac1289e 100644 --- a/tools/generateReleaseInfo.bat +++ b/tools/generateReleaseInfo.bat @@ -4,11 +4,8 @@ for /f "tokens=*" %%a in ('hg parents --template "{latesttag}"') do @set hgLates for /f "tokens=*" %%a in ('hg parents --template "{latesttagdistance}"') do @set hgLatesttagdistance=%%a for /f "tokens=*" %%a in ('hg parents --template "{node|short}"') do @set hgChangeset=%%a -echo set(HG_BRANCH %hgBranch%) > ReleaseInfo.cmake +echo set(HG_BRANCH %hgBranch%) > ReleaseInfo.cmake echo set(HG_VERSION %hgLatesttag%.%hgLatesttagdistance%) >> ReleaseInfo.cmake echo set(HG_CHANGESET %hgChangeset%) >> ReleaseInfo.cmake echo set(HG_TAGDISTANCE %hgLatesttagdistance%) >> ReleaseInfo.cmake -echo if (CACHE_NAME_SUFFIX STREQUAL "") >> ReleaseInfo.cmake -echo set(CACHE_NAME_SUFFIX %hgLatesttag%) >> ReleaseInfo.cmake -echo endif() >> ReleaseInfo.cmake