diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-06 13:56:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-06 13:56:36 (GMT) |
| commit | 488faed3ce62fc98395bbb6e38c99a63e90a5584 (patch) | |
| tree | 187d18f90b955860a0b7ea748437ae7cea298081 | |
| parent | e1ebec55d4b3e9db2c718064237707252ec4abf5 (diff) | |
| parent | bfe883af60cdf8f1c31a8b1d39a6f4f818578773 (diff) | |
| download | CMake-488faed3ce62fc98395bbb6e38c99a63e90a5584.zip CMake-488faed3ce62fc98395bbb6e38c99a63e90a5584.tar.gz CMake-488faed3ce62fc98395bbb6e38c99a63e90a5584.tar.bz2 | |
Merge topic 'FindMatlab-no-CMAKE_CL_64'
bfe883af60 FindMatlab: Remove erroneous duplicate code
Acked-by: Kitware Robot <kwrobot@kitware.com>
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 f2ada3b..12a2f75 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -1224,21 +1224,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() |