diff options
| author | Hermann von Kleist <hermann.von.kleist@ivi.fraunhofer.de> | 2024-01-24 07:41:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-07 17:12:12 (GMT) |
| commit | e22c4dfea071be0418709296e213963afcd80481 (patch) | |
| tree | 5b77f62914f5ea22641b21735f7bd1f8d4e32dde /Modules/FindMatlab.cmake | |
| parent | 5e984bb35232116a54de7db39788cb162ca7c263 (diff) | |
| download | CMake-e22c4dfea071be0418709296e213963afcd80481.zip CMake-e22c4dfea071be0418709296e213963afcd80481.tar.gz CMake-e22c4dfea071be0418709296e213963afcd80481.tar.bz2 | |
FindMatlab: Revert undocumented and now-unnecessary full version lookup
Partially revert commit dc9d9589e4 (FindMatlab:WIN32: return full Matlab
version when found via registry, 2023-09-14, v3.28.0-rc1~82^2~2). It
changed `matlab_extract_all_installed_versions_from_registry` behavior
to query `VersionInfo.xml` for version information. However, the
function documentation states that it only uses the registry. It's also
not needed since commit c608adc236 (FindMatlab: Fix major.minor version
lookups in Windows Registry, 2024-01-11, v3.28.2~13^2~1), which added
the same lookup to `matlab_get_all_valid_matlab_roots_from_registry`.
Diffstat (limited to 'Modules/FindMatlab.cmake')
| -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() |