From e22c4dfea071be0418709296e213963afcd80481 Mon Sep 17 00:00:00 2001 From: Hermann von Kleist Date: Wed, 24 Jan 2024 08:41:06 +0100 Subject: 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`. --- Modules/FindMatlab.cmake | 13 +------------ 1 file changed, 1 insertion(+), 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() -- cgit v0.12