Преглед на файлове

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`.
Hermann von Kleist преди 1 година
родител
ревизия
e22c4dfea0
променени са 1 файла, в които са добавени 1 реда и са изтрити 12 реда
  1. 1 12
      Modules/FindMatlab.cmake

+ 1 - 12
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()