changeset 12469:1a598caef5d4 draft stable

fix RC version string error in MinGW
author Radhakrishnan <radhakrishnan@multicorewareinc.com>
date Wed, 02 Jan 2019 14:15:53 +0530
parents 022e23ee33f0
children 56f54687448a
files source/CMakeLists.txt
diffstat 1 files changed, 1 insertions(+-), 2 deletions(-) [+]
line wrap: on
line diff
--- a/source/CMakeLists.txt	Thu Dec 27 16:16:28 2018 +0530
+++ b/source/CMakeLists.txt	Wed Jan 02 14:15:53 2019 +0530
@@ -575,10 +575,9 @@ if(CMAKE_RC_COMPILER)
     # often breaks them
     string(REPLACE "<FLAGS>" "" CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILE_OBJECT}")
     string(REPLACE "<DEFINES>" "" CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILE_OBJECT}")
-
     # convert X265_LATEST_TAG (ex: 0.7) and X265_TAG_DISTANCE (ex: 103) to
     # @X265_VERSION_MAJOR@,@X265_VERSION_MINOR@,@X265_BRANCH_ID@,@X265_TAG_DISTANCE@
-    string(REPLACE "." ";" VERSION_LIST "${X265_LATEST_TAG}")
+    string(REGEX MATCHALL "([0-9]+)" VERSION_LIST "${X265_LATEST_TAG}")
     list(GET VERSION_LIST 0 X265_VERSION_MAJOR)
     list(GET VERSION_LIST 1 X265_VERSION_MINOR)
     set(X265_BRANCH_ID 0) # TODO: 0 - stable, 1 - default or other