nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

another fix for CMake empty vars

Browse Source
This commit is contained in:
Riccardo Spagni 2014-09-15 23:07:47 +02:00
parent de442fb9ad
commit ffe7bf8c1c
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/version.cmake
View File

@ -40,13 +40,15 @@ if(RET)
else() else()
message(STATUS "You are currently on commit ${COMMIT}") message(STATUS "You are currently on commit ${COMMIT}")
# Give our output variable a default value, because CMake likes to choke on empty variables
set(TAGGEDCOMMITOUT "a")
# Get all the tags # Get all the tags
execute_process(COMMAND "${GIT}" show-ref --tags -d --abbrev RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMITOUT OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND "${GIT}" show-ref --tags -d --abbrev RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMITOUT OUTPUT_STRIP_TRAILING_WHITESPACE)
# Make sure we actually got some tags # Make sure we actually got some tags
if(TAGGEDCOMMITOUT)
string(LENGTH ${TAGGEDCOMMITOUT} TLEN) string(LENGTH ${TAGGEDCOMMITOUT} TLEN)
else()
set(TLEN 1)
endif()
if(RET OR TLEN LESS 5) if(RET OR TLEN LESS 5)
message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.") message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")