mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 06:40:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Merge-request: !2354
This commit is contained in:
Brad King
2018-09-05 15:20:03 -04:00
parent 925b95fbad bfe883af60
commit 3dd926f4a8
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindMatlab.cmake
-15
View File
@@ -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)