aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2014-09-15 08:24:32 +0200
committerRiccardo Spagni <ric@spagni.net>2014-09-15 08:24:32 +0200
commit51011ed96041c8a7807cca10183afc868160489f (patch)
tree33721f8db5cfcdb46090e2093bdb4706872d1276 /src
parentignore tag check if we haven't pulled tags (diff)
downloadmonero-51011ed96041c8a7807cca10183afc868160489f.tar.xz
fix logic in tag check, AND -> OR
Signed-off-by: Riccardo Spagni <ric@spagni.net>
Diffstat (limited to 'src')
-rw-r--r--src/version.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/version.cmake b/src/version.cmake
index 69890426b..c115b9d36 100644
--- a/src/version.cmake
+++ b/src/version.cmake
@@ -7,7 +7,7 @@ if(RET)
else()
message(STATUS "You are currently on commit ${COMMIT}")
execute_process(COMMAND "${GIT}" show-ref --tags -d --abbrev COMMAND awk "END{print $1}" RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(RET AND NOT TAGGEDCOMMIT)
+ if(RET OR NOT TAGGEDCOMMIT)
message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")
set(VERSIONTAG "${COMMIT}")
else()