diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-09 10:51:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-09 10:52:01 (GMT) |
| commit | 13b5588a863223bcca343ec237b5f3efe1b4fd53 (patch) | |
| tree | 091c7c6072c1da39fcee73e2c1857fb0c7d34bbd /Modules | |
| parent | ed9b60e89e8d1d0879e3956d5dd75f2d39ba4940 (diff) | |
| parent | a3c389cb17b69c041650e7abc434619809f28e09 (diff) | |
| download | CMake-13b5588a863223bcca343ec237b5f3efe1b4fd53.zip CMake-13b5588a863223bcca343ec237b5f3efe1b4fd53.tar.gz CMake-13b5588a863223bcca343ec237b5f3efe1b4fd53.tar.bz2 | |
Merge topic 'FindMatlab-unknown-version'
a3c389cb17 FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown version
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4986
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindMatlab.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index e42c206..05ec3ae 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -992,7 +992,10 @@ function(matlab_add_mex) endif() endif() - if(NOT Matlab_VERSION_STRING VERSION_LESS "9.4") # For 9.4 (R2018a) and newer, add API macro + # For 9.4 (R2018a) and newer, add API macro. + # Add it for unknown versions too, just in case. + if(NOT Matlab_VERSION_STRING VERSION_LESS "9.4" + OR Matlab_VERSION_STRING STREQUAL "unknown") if(${${prefix}_R2018a}) set(MEX_API_MACRO "MATLAB_DEFAULT_RELEASE=R2018a") else() |