Skip to content

Commit db27083

Browse files
ktfChristianTackeGSI
authored andcommitted
Fix FindROOT.cmake to work with v6.30.00
1 parent 416b22d commit db27083

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

cmake/modules/FindROOT.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ If(ROOT_CONFIG_EXECUTABLE)
7676

7777
# extract major, minor, and patch versions from
7878
# the version string given by root-config
79-
String(REGEX REPLACE "^([0-9]+)\\.[0-9][0-9]+\\/[0-9][0-9]+.*" "\\1" ROOT_VERSION_MAJOR "${ROOT_VERSION_STRING}")
80-
String(REGEX REPLACE "^[0-9]+\\.([0-9][0-9])+\\/[0-9][0-9]+.*" "\\1" ROOT_VERSION_MINOR "${ROOT_VERSION_STRING}")
81-
String(REGEX REPLACE "^[0-9]+\\.[0-9][0-9]+\\/([0-9][0-9]+).*" "\\1" ROOT_VERSION_PATCH "${ROOT_VERSION_STRING}")
79+
String(REGEX REPLACE "^([0-9]+)\\.[0-9][0-9]+[\\/.][0-9][0-9]+.*" "\\1" ROOT_VERSION_MAJOR "${ROOT_VERSION_STRING}")
80+
String(REGEX REPLACE "^[0-9]+\\.([0-9][0-9])+[\\/.][0-9][0-9]+.*" "\\1" ROOT_VERSION_MINOR "${ROOT_VERSION_STRING}")
81+
String(REGEX REPLACE "^[0-9]+\\.[0-9][0-9]+[\\/.]([0-9][0-9]+).*" "\\1" ROOT_VERSION_PATCH "${ROOT_VERSION_STRING}")
8282

8383
if(NOT ROOT_FIND_VERSION_MAJOR)
8484
set(ROOT_FIND_VERSION_MAJOR 0)

0 commit comments

Comments
 (0)