浏览代码

FindMatlab: Fix version detection for MCR >= 9.10

Recent MCR versions have the following `VersionInfo.xml`:

    <version>9.11.0.1837725</version>

Fix parsing of multiple digits in the version components
so that we do not mistake this for version `9.1`.
Tom M 3 年之前
父节点
当前提交
b8d885ed0d
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      Modules/FindMatlab.cmake

+ 1 - 1
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()