From f34ac1c69b3ab0f6e3565c1c9ff7ebbd69bcab9a Mon Sep 17 00:00:00 2001 From: Job Noorman Date: Tue, 5 Sep 2017 12:14:34 +0200 Subject: FindMatlab: Don't use the deprecated variable CMAKE_CL_64 The variable is not defined on 64-bit MinGW, causing a 32-bit Matlab version to be found. Check using CMAKE_SIZEOF_VOID_P instead. --- Modules/FindMatlab.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index cd8246d..7493281 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -1134,7 +1134,14 @@ else() # testing if we are able to extract the needed information from the registry set(_matlab_versions_from_registry) - matlab_extract_all_installed_versions_from_registry(CMAKE_CL_64 _matlab_versions_from_registry) + + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(_matlab_win64 ON) + else() + set(_matlab_win64 OFF) + endif() + + matlab_extract_all_installed_versions_from_registry(_matlab_win64 _matlab_versions_from_registry) # the returned list is empty, doing the search on all known versions if(NOT _matlab_versions_from_registry) -- cgit v0.12