diff options
| author | Silvio Traversaro <pegua1@gmail.com> | 2021-03-09 16:03:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-09 17:56:08 (GMT) |
| commit | 5ba1f4b6ee4a926216877efd1576f618dda8c05d (patch) | |
| tree | 2d64ca7de354e6450e4b460ffe2c2edd24eb2e7c /Modules | |
| parent | 791338359f7a78032209a255d16a613360f5430a (diff) | |
| download | CMake-5ba1f4b6ee4a926216877efd1576f618dda8c05d.zip CMake-5ba1f4b6ee4a926216877efd1576f618dda8c05d.tar.gz CMake-5ba1f4b6ee4a926216877efd1576f618dda8c05d.tar.bz2 | |
FindMatlab: Fix Matlab_LIBRARIES for MCR
In commit bda5e2ac8f (FindMatlab: Only include engine and dataarray
libraries if they are found, 2020-12-11, v3.20.0-rc1~297^2~1) we fixed
the imported target to contain optional libraries only if they are
found. Do the same for `Matlab_LIBRARIES`.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindMatlab.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index ec163e8..efe871b 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -1854,8 +1854,15 @@ endif() set(Matlab_LIBRARIES ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} - ${Matlab_ENG_LIBRARY} ${Matlab_MAT_LIBRARY} - ${Matlab_DATAARRAY_LIBRARY} ${Matlab_ENGINE_LIBRARY}) + ${Matlab_ENG_LIBRARY} ${Matlab_MAT_LIBRARY}) + +if(Matlab_ENGINE_LIBRARY) + list(APPEND Matlab_LIBRARIES ${Matlab_ENGINE_LIBRARY}) +endif() + +if(Matlab_DATAARRAY_LIBRARY) + list(APPEND Matlab_LIBRARIES ${Matlab_DATAARRAY_LIBRARY}) +endif() find_package_handle_standard_args( Matlab |