diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-05 19:20:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-05 19:20:03 (GMT) |
| commit | 3dd926f4a8b0994f46b9dc877bc954fb3531bc5e (patch) | |
| tree | a93030ec2c8ad13b17ebedb7ec41f68995dff141 | |
| parent | 925b95fbadae0fe59f38b744dfb0f665436d8d11 (diff) | |
| parent | bfe883af60cdf8f1c31a8b1d39a6f4f818578773 (diff) | |
| download | CMake-3dd926f4a8b0994f46b9dc877bc954fb3531bc5e.zip CMake-3dd926f4a8b0994f46b9dc877bc954fb3531bc5e.tar.gz CMake-3dd926f4a8b0994f46b9dc877bc954fb3531bc5e.tar.bz2 | |
Merge branch 'FindMatlab-no-CMAKE_CL_64' into release-3.12
Merge-request: !2354
| -rw-r--r-- | Modules/FindMatlab.cmake | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 54e62db..2d04b84 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -1218,21 +1218,6 @@ function(_Matlab_find_instances_win32 matlab_roots) # 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) endfunction() |