From 363a7d4693c32263d20f257ec95603399e62a36e Mon Sep 17 00:00:00 2001 From: Hermann von Kleist Date: Mon, 22 Jan 2024 09:35:18 +0100 Subject: FindMatlab: matlab_get_release_name_from_version is a function now --- Modules/FindMatlab.cmake | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 609cd4e..0222078 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -189,17 +189,13 @@ Cached variables the location of the root of the Matlab installation found. If this value is changed by the user, the result variables are recomputed. -Provided macros -^^^^^^^^^^^^^^^ +Provided commands +^^^^^^^^^^^^^^^^^ :command:`matlab_get_version_from_release_name` returns the version from the release name :command:`matlab_get_release_name_from_version` returns the release name from the Matlab version - -Provided functions -^^^^^^^^^^^^^^^^^^ - :command:`matlab_add_mex` adds a target compiling a MEX file. :command:`matlab_add_unit_test` -- cgit v0.12 From 44d2cf3ed4b192317093342d346b408e98122650 Mon Sep 17 00:00:00 2001 From: Hermann von Kleist Date: Mon, 22 Jan 2024 09:40:56 +0100 Subject: FindMatlab: Document all registry paths for version lookup --- Modules/FindMatlab.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 0222078..78ad892 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -438,9 +438,10 @@ endmacro() are installed. The found versions are returned in `matlab_versions`. Set `win64` to `TRUE` if the 64 bit version of Matlab should be looked for The returned list contains all versions under - ``HKLM\\SOFTWARE\\Mathworks\\MATLAB`` and - ``HKLM\\SOFTWARE\\Mathworks\\MATLAB Runtime`` or an empty list in case an - error occurred (or nothing found). + ``HKLM\\SOFTWARE\\Mathworks\\MATLAB``, + ``HKLM\\SOFTWARE\\Mathworks\\MATLAB Runtime`` and + ``HKLM\\SOFTWARE\\Mathworks\\MATLAB Compiler Runtime`` or an empty list in + case an error occurred (or nothing found). .. note:: -- cgit v0.12 From b8665d44ba58d52113da8333b68d0d1ab5c7a67b Mon Sep 17 00:00:00 2001 From: Hermann von Kleist Date: Mon, 22 Jan 2024 09:46:13 +0100 Subject: FindMatlab: Fix error message from function --- Modules/FindMatlab.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 78ad892..987427f 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -452,7 +452,7 @@ endmacro() function(matlab_extract_all_installed_versions_from_registry win64 matlab_versions) if(NOT CMAKE_HOST_WIN32) - message(FATAL_ERROR "[MATLAB] This macro can only be called by a Windows host") + message(FATAL_ERROR "[MATLAB] This function can only be called by a Windows host") endif() if(${win64} AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "64") -- cgit v0.12