changeset 12681:a12bdab5706d Release_3.3

Fixing x265 git binary version in cmake
author Janani TE <janani.te@multicorewareinc.com>
date Tue, 25 Aug 2020 19:35:30 +0530
parents 87b405d142ae
children a3056c058d1a
files source/cmake/version.cmake
diffstat 1 files changed, 1 insertions(+-), 9 deletions(-) [+]
line wrap: on
line diff
--- a/source/cmake/version.cmake	Mon May 04 11:50:39 2020 +0530
+++ b/source/cmake/version.cmake	Tue Aug 25 19:35:30 2020 +0530
@@ -65,15 +65,7 @@ elseif(HG_EXECUTABLE AND EXISTS ${CMAKE_
 elseif(GIT_EXECUTABLE AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
     execute_process(
         COMMAND
-        ${GIT_EXECUTABLE} rev-list --tags --max-count=1
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        OUTPUT_VARIABLE X265_LATEST_TAG_COMMIT
-        ERROR_QUIET
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-    execute_process(
-        COMMAND
-        ${GIT_EXECUTABLE} describe --tags ${X265_LATEST_TAG_COMMIT}
+        ${GIT_EXECUTABLE} describe --abbrev=0 --tags
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         OUTPUT_VARIABLE X265_LATEST_TAG
         ERROR_QUIET