diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-15 14:50:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-15 14:50:08 (GMT) |
| commit | db5b4f40c3b050afabd1c7d1f038723ae4f01e60 (patch) | |
| tree | 0ce8c2947b3317f3b67af37bc07ae336f2446e21 | |
| parent | fb925e5443b1c8236fb93831df595a4dd5ec07b1 (diff) | |
| parent | b8d885ed0d801d02052c65a8482b55587e60fffd (diff) | |
| download | CMake-db5b4f40c3b050afabd1c7d1f038723ae4f01e60.zip CMake-db5b4f40c3b050afabd1c7d1f038723ae4f01e60.tar.gz CMake-db5b4f40c3b050afabd1c7d1f038723ae4f01e60.tar.bz2 | |
Merge topic 'FindMatlab-mcr911' into release-3.23
b8d885ed0d FindMatlab: Fix version detection for MCR >= 9.10
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6976
| -rw-r--r-- | Modules/FindMatlab.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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() |