From b8d885ed0d801d02052c65a8482b55587e60fffd Mon Sep 17 00:00:00 2001 From: Tom M Date: Sun, 13 Feb 2022 11:42:32 -0500 Subject: FindMatlab: Fix version detection for MCR >= 9.10 Recent MCR versions have the following `VersionInfo.xml`: 9.11.0.1837725 Fix parsing of multiple digits in the version components so that we do not mistake this for version `9.1`. --- Modules/FindMatlab.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 0ca593e..f0e991b 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -1353,7 +1353,7 @@ function(_Matlab_get_version_from_root matlab_root matlab_or_mcr matlab_known_ve ${versioninfo_string} ) - if(CMAKE_MATCH_1 MATCHES "(([0-9])\\.([0-9]))[\\.0-9]*") + if(CMAKE_MATCH_1 MATCHES "(([0-9]+)\\.([0-9]+))[\\.0-9]*") set(_matlab_version_tmp "${CMAKE_MATCH_1}") endif() endif() -- cgit v0.12