summaryrefslogtreecommitdiffstats
path: root/Modules/FindMatlab.cmake
Commit message (Collapse)AuthorAgeFilesLines
* FindMatlab: Fix search for MCRNikolaj Fogh2020-12-111-29/+47
| | | | Fixes: #21068, #21582
* FindMatlab: Only include engine and dataarray libraries if they are foundNikolaj Fogh2020-12-111-3/+6
|
* Help: Add `.. versionadded` directives to module docsNikita Nemkin2020-12-021-3/+35
| | | | Issue: #19715
* Merge topic 'FindMatlab-r2020b'Brad King2020-09-181-0/+1
|\ | | | | | | | | | | | | 4d292aecb6 FindMatlab: add R2020b => 9.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5233
| * FindMatlab: add R2020b => 9.9Michael Hirsch2020-09-171-0/+1
| |
* | FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown versionAlexey Kreschuk2020-07-081-1/+4
|/ | | | | | | An "unknown" version does not always mean an old version. Setting this macro by mistake does not result in a compilation error, but not setting it does. I had this error when compiling from a user that does not have a matlab license.
* FindMatlab: Add R2020a=9.8Michael Hirsch, Ph.D2020-03-191-0/+1
| | | | This allows Matlab R2020a to be recognized as a valid Matlab version.
* Merge topic 'FindMatlab-r2019'Brad King2020-01-141-0/+2
|\ | | | | | | | | | | | | edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4207
| * FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPINGSilvio Traversaro2020-01-131-0/+2
| | | | | | | | | | | | Reference for versions: https://www.mathworks.com/products/compiler/matlab-runtime.html Fixes: #20087
* | FindMatlab: in matlab_add_mex use the correct version fileSilvio Traversaro2020-01-131-4/+13
|/ | | | | | | | | | | Before this modification, the c_mexapi_version.c file was added to all mex libraries. However, if the C language was not enabled in the CMake project configuration, the c_mexapi_version.c file was ignored, creating linking errors in Windows and macOS. This commit ensures that in the case only the CXX languages is enabled, the correct version is passed. Fixes: #19382
* FindMatlab: code comment and ordering of the findersRaffi Enficiaud2019-07-141-73/+69
|
* FindMatlab: fixing extension bat file invocation errorRaffi Enficiaud2019-07-141-2/+11
| | | | | If the environment variable MATLAB_ARCH is set prior to the call, the called scripts do not return an error message.
* FindMatlab: Fixing compilation issues on WindowsRaffi Enficiaud2019-07-141-6/+1
|
* FindMatlab: EXCLUDE_FROM_ALL parameter to matlab_add_mexRaffi Enficiaud2019-06-261-1/+13
| | | | Enabling a mex target to be excluded from the `all` target.
* Merge topic 'FindMatlab/issue-19279-mex-compilation-error-on-attribute'Brad King2019-06-261-3/+5
|\ | | | | | | | | | | | | c2595a4958 FindMatlab: removing spaces in compiler define Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3473
| * FindMatlab: removing spaces in compiler defineRaffi Enficiaud2019-06-251-3/+5
| | | | | | | | | | | | | | Spaces in `DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))` are causing a compilation error. Fixes: #19279
* | Merge topic 'matlab-if'Brad King2019-06-251-25/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | 56e89e50d3 FindMatlab: simplify several if()-constructs 51bcdeb17f Tests: simplify checks for Matlab variables being set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3472
| * | FindMatlab: simplify several if()-constructsRolf Eike Beer2019-06-241-25/+25
| |/
* | FindMatlab: Support EXACT versionsStefan Lietzau2019-06-241-8/+22
|/ | | | | | | If an exact version is requested, don't pick the latest matlab version but the one matching the requested version. Fixes: #19155
* FindMatlab: Tolerate empty version log fileSebastian Nagel2019-02-111-2/+2
|
* FindMatlab: Fix linker command under Windows.Cris Luengo2018-10-291-4/+5
|
* FindMatlab: `matlab_add_mex` has new options `R2017b` and `R2018a`.Cris Luengo2018-10-241-70/+87
| | | | | | | | - These options are equivalent to `mex` command options `-R2017b` and `-R2018a`. - `R2017b` is the default, and selects the compatability API. - `R2018a` is the alternative, and selects the new complex-interleaved API. - For versions of MATLAB before R2018a, these options are ignored. - `matlab_add_mex` now works correctly with newer MATLABs.
* FindMatlab: Always find core libraries.Cris Luengo2018-10-241-48/+35
| | | | | - `MX_LIBRARY`, `Matlab_ENGINE_LIBRARY` and `Matlab_DATAARRAY_LIBRARY` are always found. - The corresponding options are now ignored.
* Help: Convert remaining modules to block-style commentsKitware Robot2018-10-221-425/+434
|
* FindMatlab: Add Matlab 2018a,b to version listSean Warren2018-09-261-0/+2
|
* FindMatlab: Explicitly export mexFunction in MSVCSean Warren2018-09-261-0/+14
| | | | Fixes: #18391
* FindMatlab: Optionally allow linking to MatlabEngine and MatlabDataArraySean Warren2018-09-261-0/+62
| | | | Fixes: #17971
* Merge topic 'FindMatlab-no-CMAKE_CL_64'Brad King2018-09-061-15/+0
|\ | | | | | | | | | | | | bfe883af60 FindMatlab: Remove erroneous duplicate code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2354
| * FindMatlab: Remove erroneous duplicate codeRaffi Enficiaud2018-09-051-15/+0
| | | | | | | | | | | | | | This was left accidentally when resolving merge conflicts between previous changes. Fixes: #18221
* | FindMatlab: Guard against nonexistent installationChuck Atkins2018-08-271-12/+14
| |
* | Merge topic 'FindMatlab-mcc'Brad King2018-08-061-1/+22
|\ \ | | | | | | | | | | | | | | | | | | f34f6eb3d1 FindMatlab: Add component to find MCC, the Matlab compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2233
| * | FindMatlab: Add component to find MCC, the Matlab compilerJason Heeris2018-08-011-1/+22
| |/ | | | | | | | | | | | | Add component `MCC_COMPILER` to request searching for the Matlab compiler. Report it in `Matlab_MCC_COMPILER` if it is found. Issue: #18183
* | FindMatlab: only search registry on windows hostsJulien Schueller2018-08-011-1/+1
|/ | | From Linux, it fails when cross-compiling
* Fix misc. typosluz.paz2018-06-041-1/+1
| | | | Found via `codespell` and `grep`
* FindMatlab: Matlab Runtime Compiler supportRaffi Enficiaud2018-04-231-222/+377
| | | | | | | | | | * Determining automatically the MCR version on OSX and Windows * Distinguishing between MCR and Matlab * Specific tests for the MCR * mexext on windows does not work properly: the mexext is hardcoded * Doc updates for the MCR Fixes: #16487
* Find*: always include FPHSA shipped with CMakeRolf Eike Beer2018-04-021-1/+1
|
* Various typo fixesLuz Paz2018-01-031-1/+1
| | | | Some are user-facing. Others are source comments.
* FindMatlab: Avoid if() auto-dereference in 64-bit host detectionBrad King2017-11-151-1/+1
| | | | | | | | | If the value of `CMAKE_HOST_SYSTEM_PROCESSOR` also happens to be set as a variable by a project (e.g. `AMD64`), allowing `if()` to auto-dereference is unlikely to produce a value that matches "64". Instead let `if()` auto-dereference `CMAKE_HOST_SYSTEM_PROCESSOR`. Fixes: #17460
* Fix trivial typos in textluzpaz2017-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some are user facing. Found using codespell -q 3 --skip="./Utilities" -I .cmake-whitelist.txt` whereby the whitelist contained: ans dum helpfull emmited emmitted buil iff isnt nto ot pathes substract te todays upto whitespaces
* FindMatlab: Add support for MATLAB 2017bJamie Snape2017-10-041-1/+1
|
* FindMatlab: Fix extraction of quoted version numberBrad King2017-09-271-2/+2
| | | | | | | | The version string in recent Matlab versions has changed. Now the version number is inside two `'`. Patch-by: nama on gitlab.kitware.com Fixes: #17308
* FindMatlab: Don't use the deprecated variable CMAKE_CL_64Job Noorman2017-09-081-1/+8
| | | | | 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.
* FindMatlab: CUSTOM_TEST_COMMAND documentation fixRaffi Enficiaud2017-07-271-2/+2
| | | | | Documentation states CUSTOM_MATLAB_COMMAND, while code uses CUSTOM_TEST_COMMAND. Addresses issue #17107
* FindMatlab: Add support for Matlab 2017aRaffi Enficiaud2017-05-011-0/+1
|
* Merge topic 'FindMatlab-fix-typo'Brad King2016-11-011-1/+1
|\ | | | | | | | | f2de7079 FindMatlab: Fix typo in matlab_add_unit_test implementation
| * FindMatlab: Fix typo in matlab_add_unit_test implementationMatthew Woehlke2016-10-281-1/+1
| | | | | | | | | | | | | | Fix typo in variable used to communicate between matlab_add_unit_test and its helper script MatlabTestsRedirect.cmake that was introduced in commit v3.7.0-rc1~116^2 (FindMatlab: Extend matlab_add_unit_test to run arbitrary test code, 2016-08-30).
* | FindMatlab: Add support for Matlab 2016b (9.1)Francesco Romano2016-10-281-0/+1
|/
* Merge branch 'FindMatlab-fix-simulink-cache' into releaseBrad King2016-10-051-0/+1
|\
| * FindMatlab: remove SIMULINK path from cache when FindMatlab is reconfiguredRaffi Enficiaud2016-10-051-0/+1
| |
* | FindMatlab: small documentation fixesRaffi Enficiaud2016-10-051-8/+7
|/