diff options
author | GENIVI Audio Manager Maintainer <genivi-maint-audiomanager@smtp1.genivi.org> | 2018-02-07 08:01:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-07 08:01:33 +0100 |
commit | bcaeed20bbbb4375ae925d507821d2bef64e737b (patch) | |
tree | 4ee83de4b3b00c9c513c83d5c4e7c6bb8107d954 /cmake/MacroVersionFromGit.cmake | |
parent | aa59667c69254b0e2cb43cfcdba8d83db4f26e73 (diff) | |
parent | a551ce940f073a7a2afa7df104b9eabc99e9f4a2 (diff) | |
download | audiomanager-bcaeed20bbbb4375ae925d507821d2bef64e737b.tar.gz |
Merge pull request #23 from JensLorenz/cmake_and_dlt_endless_loop_fix
Cmake and dlt endless loop fix
Diffstat (limited to 'cmake/MacroVersionFromGit.cmake')
-rw-r--r-- | cmake/MacroVersionFromGit.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cmake/MacroVersionFromGit.cmake b/cmake/MacroVersionFromGit.cmake index 05a9030..94931c6 100644 --- a/cmake/MacroVersionFromGit.cmake +++ b/cmake/MacroVersionFromGit.cmake @@ -23,12 +23,14 @@ IF (TAG_LIST AND NOT VERSION) OUTPUT_VARIABLE COMMIT_LIST OUTPUT_STRIP_TRAILING_WHITESPACE) - STRING (REPLACE "\n" ";" COMMIT_LIST ${COMMIT_LIST}) + IF (COMMIT_LIST) + STRING (REPLACE "\n" ";" COMMIT_LIST ${COMMIT_LIST}) - LIST (LENGTH COMMIT_LIST MINOR_VERSION) + LIST (LENGTH COMMIT_LIST MINOR_VERSION) - SET (DAEMONVERSION "${VERSION_MISSING_MINOR}.${MINOR_VERSION}") -ENDIF (TAG_LIST AND NOT VERSION) + SET (DAEMONVERSION "${VERSION_MISSING_MINOR}.${MINOR_VERSION}") + ENDIF (COMMIT_LIST) +ENDIF (TAGLIST AND NOT VERSION) if (NOT DAEMONVERSION) #Can be changed via passing -DVERSION="XXX" to cmake |