diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-08 14:41:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-08 14:42:12 (GMT) |
| commit | aba76cdaed1488112986aa5e2f670b18d82095cc (patch) | |
| tree | 105f5c83caf929e29b929508db68f9ed3e2d20a5 | |
| parent | f610541523d44301d2a814531af4c5c21d7d3fed (diff) | |
| parent | e22c4dfea071be0418709296e213963afcd80481 (diff) | |
| download | CMake-aba76cdaed1488112986aa5e2f670b18d82095cc.zip CMake-aba76cdaed1488112986aa5e2f670b18d82095cc.tar.gz CMake-aba76cdaed1488112986aa5e2f670b18d82095cc.tar.bz2 | |
Merge topic 'findmatlab-registry-lookup-without-versionxml' into release-3.29
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 608b2ed..6c80506 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() |