diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-08 14:39:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-08 14:40:05 (GMT) |
| commit | f4b5152f472edcefb3068b8c276bc28df59c9635 (patch) | |
| tree | 784086bb5791e0cacb406070dda79dba427afc1d | |
| parent | a98f3631c9682d973baf0d0021884ee6f39040d1 (diff) | |
| parent | e22c4dfea071be0418709296e213963afcd80481 (diff) | |
| download | CMake-f4b5152f472edcefb3068b8c276bc28df59c9635.zip CMake-f4b5152f472edcefb3068b8c276bc28df59c9635.tar.gz CMake-f4b5152f472edcefb3068b8c276bc28df59c9635.tar.bz2 | |
Merge topic 'findmatlab-registry-lookup-without-versionxml' into release-3.28
e22c4dfea0 FindMatlab: Revert undocumented and now-unnecessary full version lookup
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9226
| -rw-r--r-- | Modules/FindMatlab.cmake | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 18255b6..15c3f64 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -485,18 +485,7 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio foreach(_match IN LISTS _versions_regex) if(_match MATCHES "([0-9]+(\\.[0-9]+)+)") - cmake_host_system_information(RESULT _reg - QUERY WINDOWS_REGISTRY "HKLM/SOFTWARE/Mathworks/${_installation_type}/${CMAKE_MATCH_1}" - VALUE "MATLABROOT" - VIEW ${_view} - ) - - _Matlab_VersionInfoXML("${_reg}" _matlab_version_tmp) - if("${_matlab_version_tmp}" STREQUAL "unknown") - list(APPEND matlabs_from_registry ${_match}) - else() - list(APPEND matlabs_from_registry ${_matlab_version_tmp}) - endif() + list(APPEND matlabs_from_registry ${_match}) endif() endforeach() |