From 068a13ca7c1fdaefbfc4e846aaa8eefe9eb1d821 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Tue, 13 Feb 2018 09:58:35 +0100 Subject: build: Add sort command to GitVersionGen This adds the sort command with the version sort to GitVersionGen so the latest version is used when running cmake. Signed-off-by: Sander Vrijders Signed-off-by: Dimitri Staessens --- cmake/GitVersionGen.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmake/GitVersionGen.cmake b/cmake/GitVersionGen.cmake index 42753d7c..51d8c9b7 100644 --- a/cmake/GitVersionGen.cmake +++ b/cmake/GitVersionGen.cmake @@ -5,6 +5,12 @@ macro(git_version_gen) message(FATAL_ERROR "This is not a git repository") endif () + find_program(SORT "sort") + mark_as_advanced(SORT) + if (${SORT} STREQUAL "") + message(FATAL_ERROR "Cannot find the sort executable") + endif () + find_program(TAIL "tail") mark_as_advanced(TAIL) if (${TAIL} STREQUAL "") @@ -13,6 +19,7 @@ macro(git_version_gen) execute_process( COMMAND ${GIT_EXECUTABLE} tag -l -n0 + COMMAND ${SORT} -V COMMAND ${TAIL} -n 1 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE _git_tag -- cgit v1.2.3