summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaffi Enficiaud <raffi.enficiaud@mines-paris.org>2018-09-05 18:30:19 +0200
committerBrad King <brad.king@kitware.com>2018-09-05 15:19:50 -0400
commitbfe883af60cdf8f1c31a8b1d39a6f4f818578773 (patch)
tree3ff02717c6f38fba3e58dedda7f711b56c8d6041
parentc4ab098097f4fe1bc85ee29c6de390dff435f63f (diff)
downloadcmake-bfe883af60cdf8f1c31a8b1d39a6f4f818578773.tar.gz
FindMatlab: Remove erroneous duplicate code
This was left accidentally when resolving merge conflicts between previous changes. Fixes: #18221
-rw-r--r--Modules/FindMatlab.cmake15
1 files changed, 0 insertions, 15 deletions
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 54e62db745..2d04b84dd2 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()