Преглед изворни кода

Merge branch 'FindMatlab-no-CMAKE_CL_64' into release-3.12

Merge-request: !2354
Brad King пре 7 година
родитељ
комит
3dd926f4a8
1 измењених фајлова са 0 додато и 15 уклоњено
  1. 0 15
      Modules/FindMatlab.cmake

+ 0 - 15
Modules/FindMatlab.cmake

@@ -1216,21 +1216,6 @@ function(_Matlab_find_instances_win32 matlab_roots)
     extract_matlab_versions_from_registry_brute_force(_matlab_versions_from_registry)
   endif()
 
-  # filtering the results with the registry keys
-  matlab_get_all_valid_matlab_roots_from_registry("${_matlab_versions_from_registry}" _matlab_possible_roots)
-  unset(_matlab_versions_from_registry)
-
-  set(_matlab_versions_from_registry)
-  matlab_extract_all_installed_versions_from_registry(CMAKE_CL_64 _matlab_versions_from_registry)
-
-  # the returned list is empty, doing the search on all known versions
-  if(NOT _matlab_versions_from_registry)
-    if(MATLAB_FIND_DEBUG)
-      message(STATUS "[MATLAB] Search for Matlab from the registry unsuccessful, testing all supported versions")
-    endif()
-    extract_matlab_versions_from_registry_brute_force(_matlab_versions_from_registry)
-  endif()
-
   # filtering the results with the registry keys
   matlab_get_all_valid_matlab_roots_from_registry("${_matlab_versions_from_registry}" _matlab_possible_roots)
   set(${matlab_roots} ${_matlab_possible_roots} PARENT_SCOPE)