diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-11 11:47:23 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-11 07:47:31 -0400 |
| commit | e8463e3570eaca13e4ee61fcec55b609602cbcea (patch) | |
| tree | c7fb7b9d009f5c9e8c847af1eafa614c5c6c1773 | |
| parent | 00975e926199eea21763470e2ab876246e36669a (diff) | |
| parent | f34ac1c69b3ab0f6e3565c1c9ff7ebbd69bcab9a (diff) | |
| download | cmake-e8463e3570eaca13e4ee61fcec55b609602cbcea.tar.gz | |
Merge topic 'findmatlab-remove-CMAKE_CL_64'
f34ac1c6 FindMatlab: Don't use the deprecated variable CMAKE_CL_64
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1234
| -rw-r--r-- | Modules/FindMatlab.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index cd8246d9fb..749328146c 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) |