dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 14:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

FindMatlab: Don't use the deprecated variable CMAKE_CL_64

Browse Source 
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.
This commit is contained in:
Job Noorman
2017-09-05 12:14:34 +02:00
committed by Brad King
parent ad1b9eba85
commit f34ac1c69b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/FindMatlab.cmake
View File

@@ -1134,7 +1134,14 @@ else()
# testing if we are able to extract the needed information from the registry # testing if we are able to extract the needed information from the registry
set(_matlab_versions_from_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 # the returned list is empty, doing the search on all known versions
if(NOT _matlab_versions_from_registry) if(NOT _matlab_versions_from_registry)