>From bda79a8f23f52bbfc9eca663c04ce831d39c81f2 Mon Sep 17 00:00:00 2001 From: Srikanth Kurapati <srikanth.kurap...@multicorewareinc.com> Date: Wed, 16 Dec 2020 10:52:33 +0530 Subject: [PATCH] fix: avoids unnecessary lexicographic order checks on git changesets
---
source/cmake/Version.cmake | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/source/cmake/Version.cmake b/source/cmake/Version.cmake
index 37c759268..09e642577 100644
--- a/source/cmake/Version.cmake
+++ b/source/cmake/Version.cmake
@@ -168,25 +168,13 @@ endif()
# formatting based on positive or negative distance from tag
if(X265_TAG_DISTANCE STREQUAL "0")
- if(X265_REVISION_ID STREQUAL X265_REPO_ID)
- set(X265_VERSION "${X265_LATEST_TAG}")
- else()
- message(WARNING "REPO AND RELEASE CHANGESETS NOT MATCHING")
- endif()
+ set(X265_VERSION "${X265_LATEST_TAG}")
elseif(X265_TAG_DISTANCE STRGREATER "0")
- if(X265_REVISION_ID STRLESS X265_REPO_ID)
- set(X265_VERSION
"${X265_LATEST_TAG}+${X265_TAG_DISTANCE}-${X265_REVISION_ID}")
- else()
- message(WARNING "ARCCHIVE TIP CHANGESET TO BE GREATER THAN
REVISION ID")
- endif()
+ set(X265_VERSION
"${X265_LATEST_TAG}+${X265_TAG_DISTANCE}-${X265_REVISION_ID}")
elseif(X265_TAG_DISTANCE STRLESS "0")
- if(X265_REVISION_ID STRGREATER X265_REPO_ID)
- set(X265_VERSION
"${X265_LATEST_TAG}${X265_TAG_DISTANCE}+${X265_REPO_ID}")
- else()
- message(WARNING "REVISION ID EXPECTED TO BE LARGER THAN ARCHIVE
TIP CHANGESET")
- endif()
+ set(X265_VERSION
"${X265_LATEST_TAG}${X265_TAG_DISTANCE}+${X265_REPO_ID}")
else()
- message(ERROR "Inappropriate set of version information")
+ message(ERROR "Inappropriate version information")
endif()
#will always be printed in its entirety based on version file
configuration to avail revision monitoring by repo owners
--
2.20.1.windows.1
--
*With Regards,*
*Srikanth Kurapati.*
0001-fix-avoids-unnecessary-lexicographic-order-checks-on.patch
Description: Binary data
_______________________________________________ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel
