Explorar o código

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.
Job Noorman %!s(int64=8) %!d(string=hai) anos
pai
achega
f34ac1c69b
Modificáronse 1 ficheiros con 8 adicións e 1 borrados
  1. 8 1
      Modules/FindMatlab.cmake

+ 8 - 1
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)