[x265] [PATCH 2 of 3] Fix git X265_VERSION and X265_LATEST_TAG

Ricardo Constantino wiiaboo at gmail.com
Tue May 31 15:17:25 CEST 2016


# HG changeset patch
# User Ricardo Constantino <wiiaboo at gmail.com>
# Date 1464700010 -3600
#      Tue May 31 14:06:50 2016 +0100
# Node ID 227fc2663961b470a250ca1cdcebf79a411e6d9d
# Parent  44a961fc08b75e77f0120fa869b1aefd167b075b
Fix git X265_VERSION and X265_LATEST_TAG

diff -r 44a961fc08b7 -r 227fc2663961 source/cmake/version.cmake
--- a/source/cmake/version.cmake	Tue May 31 14:04:11 2016 +0100
+++ b/source/cmake/version.cmake	Tue May 31 14:06:50 2016 +0100
@@ -71,7 +71,7 @@
 elseif(GIT_EXECUTABLE AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
     execute_process(
         COMMAND
-        ${GIT_EXECUTABLE} describe --tags --abbrev=0
+        ${GIT_EXECUTABLE} describe --tags --abbrev=0 --first-parent
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         OUTPUT_VARIABLE X265_LATEST_TAG
         ERROR_QUIET
@@ -80,7 +80,7 @@
 
     execute_process(
         COMMAND
-        ${GIT_EXECUTABLE} describe --tags
+        ${GIT_EXECUTABLE} describe --tags --first-parent
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         OUTPUT_VARIABLE X265_VERSION
         ERROR_QUIET


More information about the x265-devel mailing list