mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
62,497 Commits 2 Branches 385 Tags
39880e09d4c19f24ee7e530ef552cb6b61b56bee
Commit Graph

109 Commits

Author SHA1 Message Date
Brad King
04b0d5c862 codespell: Fix typos 2023-05-22 16:51:15 -04:00
Brad King
6aa58ebaba Merge topic 'FindMatlab-R2023a' 
58ab34d88a FindMatlab: add version/release map for R2023a

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8334
 2023-03-17 07:46:54 -04:00
scivision
58ab34d88a FindMatlab: add version/release map for R2023a 2023-03-16 11:08:05 -04:00
scivision
1932ae0284 FindMatlab: refactor: use string(APPEND 2023-03-07 15:34:36 -05:00
scivision
c4cacdc7eb FindMatlab: use modern foreach() 
remove unused superseded commented code
 2023-03-07 15:34:35 -05:00
scivision
af05544c49 FindMatlab: document function input/output 2023-03-07 15:34:35 -05:00
scivision
257a3e870e FindMatlab: add Matlab_VERSION and document. 
fixes #24569
 2023-03-07 15:32:56 -05:00
Brad King
be4dcdf100 Merge topic 'FindMatlab-macos-rosetta' 
1bc9b0f256 FindMatlab: accommodate Matlab running under Rosetta
8dcd14bb87 FindMatlab: simplify mexext find logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8063
 2023-01-13 08:57:43 -05:00
scivision
1bc9b0f256 FindMatlab: accommodate Matlab running under Rosetta 
fixes #24312
 2023-01-12 09:47:09 -05:00
scivision
8dcd14bb87 FindMatlab: simplify mexext find logic 
This eliminates an explicit for() loop
 2023-01-12 08:41:13 -05:00
Jorrit Olthuis
6683c20f22 FindMatlab: Add SYSTEM include flag for matlab_add_mex 
Add the `SYSTEM` flag for include directories provided by MATLAB, as the
the pragmas used are not compatible with GCC and generate a warning.

Fixes: #24166
 2023-01-11 15:26:19 -05:00
Brad King
689eb0c306 Merge topic 'matlab-r2022b' 
edbdfba3f5 FindMatlab: add R2022b 9.13 version map

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7683
 2022-09-19 10:19:12 -04:00
Michael Hirsch
edbdfba3f5 FindMatlab: add R2022b 9.13 version map 2022-09-16 10:29:19 -04:00
Brad King
671509ff27 Merge topic 'FindMatlab-macos-arm64' 
f0edac914a FindMatlab: Add MEX binary file suffix for Apple Silicon native Matlab

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7673
 2022-09-15 09:05:53 -04:00
Michael Hirsch
f0edac914a FindMatlab: Add MEX binary file suffix for Apple Silicon native Matlab 
The Matlab MEX binary file suffix is distinct for Apple Silicon.
 2022-09-14 14:05:35 -04:00
Michael Hirsch
72dd680609 FindMatlab: follow CMP0074 <PackageName>_ROOT search behavior 2022-09-01 10:48:13 -04:00
Michael Hirsch
ba74c58ca4 FindMatlab: add'l check that Matlab test version file exists 
this last resort check is for some HPC with "module load matlab"
not enacted that fail to catch in earlier checks. That would
error CMake configure even if find_package(Matlab) is not REQUIRED
 2022-09-01 10:35:41 -04:00
Silvio
178cf34bdc FindMatlab: Add NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES option to matlab_add_mex 2022-04-05 08:27:09 -04:00
Silvio Traversaro
8468dfb35f FindMatlab: Use -batch option in matlab_add_unit_test if possible 2022-03-21 14:58:24 -04:00
Silvio
ebb0685824 FindMatlab: Add fallback to use -batch option in version extraction 
Fixes: #22646
 2022-03-18 15:36:04 +01:00
Michael Hirsch
6032213456 FindMatlab: Add R2022a => 9.12 version 2022-03-18 07:22:42 -04:00
Michael Hirsch
bb2c7b7dc0 FindMatlab: Fix logic error when minimum version is not found 
Fix logic added by commit 7fdd5128b1 (FindMatlab: Fix version selection
if a version is given, 2021-07-02, v3.22.0-rc1~66^2).  Ensure that
`_list_index` is always initialized to -1, akin to `list(FIND)` not
finding a match.

Issue: #22377
 2022-03-07 10:12:43 -05:00
Tom M
b8d885ed0d FindMatlab: Fix version detection for MCR >= 9.10 
Recent MCR versions have the following `VersionInfo.xml`:

    <version>9.11.0.1837725</version>

Fix parsing of multiple digits in the version components
so that we do not mistake this for version `9.1`.
 2022-02-14 10:23:33 -05:00
Alexander Neumann
7fdd5128b1 FindMatlab: Fix version selection if a version is given 
Fixes: #22377
 2021-09-29 14:33:36 -04:00
Brad King
1f8b4afbce Merge topic 'FindMatlab-r2021b' 
a013404f43 FindMatlab: Add R2021b => 9.11 version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6556
 2021-09-24 09:14:20 -04:00
Michael Hirsch
a013404f43 FindMatlab: Add R2021b => 9.11 version 
R2021b released 09/22/2021.
 2021-09-23 10:41:20 -04:00
Vincent Newsum
2f43ba5073 FindMatlab: Sort available Matlab versions using natural comparison. 
On Windows, when FindMatlab.cmake searches the registry for installed Matlab versions, it sorts these versions alphabetically.
Since Matlab 2021a (version 9.10) came out this became a problem as now version 9.10 is placed after 9.1 instead of after a higher version less than 9.10.
The result is that FindMatlab doesn't return the highest version by default.
This fix uses the natural sort comparison which was introduced in CMake 3.18.
 2021-09-22 09:43:56 +02:00
Silvio Traversaro
161990b921 FindMatlab: Add imported targets 2021-09-13 12:12:05 -04:00
Josef Angstenberger
87f8843d8b FindMatlab: Fix spelling in warning and documentation 2021-05-07 17:00:16 +02:00
Josef Angstenberger
dad5b9d845 Modules: Fix typos and spelling in comments 2021-05-07 17:00:15 +02:00
Michael Hirsch
427f5f2fa9 FindMatlab: R2021a version map 2021-03-15 09:10:07 -04:00
Silvio Traversaro
5ba1f4b6ee 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`.
 2021-03-09 12:56:08 -05:00
Nikolaj Fogh
9c360b9eea FindMatlab: Fix search for MCR 
Fixes: #21068, #21582
 2020-12-11 11:30:59 -05:00
Nikolaj Fogh
bda5e2ac8f FindMatlab: Only include engine and dataarray libraries if they are found 2020-12-11 11:27:35 -05:00
Nikita Nemkin
8fea95319b Help: Add .. versionadded directives to module docs 
Issue: #19715
 2020-12-02 21:00:30 +05:00
Brad King
bdd0e28782 Merge topic 'FindMatlab-r2020b' 
4d292aecb6 FindMatlab: add R2020b => 9.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5233
 2020-09-18 08:41:08 -04:00
Michael Hirsch
4d292aecb6 FindMatlab: add R2020b => 9.9 2020-09-17 08:58:21 -04:00
Alexey Kreschuk
a3c389cb17 FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown version 
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.
 2020-07-08 08:56:10 -04:00
Michael Hirsch, Ph.D
75331a4578 FindMatlab: Add R2020a=9.8 
This allows Matlab R2020a to be recognized as a valid Matlab version.
 2020-03-19 12:47:10 -04:00
Brad King
ba0ae1261a Merge topic 'FindMatlab-r2019' 
edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4207
 2020-01-14 08:57:19 -05:00
Silvio Traversaro
b704d58f41 FindMatlab: in matlab_add_mex use the correct version file 
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
 2020-01-13 10:52:57 -05:00
Silvio Traversaro
edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING 
Reference for versions: https://www.mathworks.com/products/compiler/matlab-runtime.html

Fixes: #20087
 2020-01-13 10:45:54 -05:00
Raffi Enficiaud
cd6bd8391a FindMatlab: code comment and ordering of the finders 2019-07-15 01:52:07 +02:00
Raffi Enficiaud
9e6206c59b FindMatlab: fixing extension bat file invocation error 
If the environment variable MATLAB_ARCH is set prior to the call, the
called scripts do not return an error message.
 2019-07-15 01:52:02 +02:00
Raffi Enficiaud
a9b36ea69f FindMatlab: Fixing compilation issues on Windows 2019-07-15 01:46:12 +02:00
Raffi Enficiaud
11e0009b77 FindMatlab: EXCLUDE_FROM_ALL parameter to matlab_add_mex 
Enabling a mex target to be excluded from the `all` target.
 2019-06-26 19:53:02 +02:00
Brad King
c92f5f6a73 Merge topic 'FindMatlab/issue-19279-mex-compilation-error-on-attribute' 
c2595a4958 FindMatlab: removing spaces in compiler define

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3473
 2019-06-26 07:11:34 -04:00
Raffi Enficiaud
c2595a4958 FindMatlab: removing spaces in compiler define 
Spaces in `DLL_EXPORT_SYM=__attribute__ ((visibility (\"default\")))`
are causing a compilation error.

Fixes: #19279
 2019-06-25 07:24:01 -04:00
Brad King
1009fd1860 Merge topic 'matlab-if' 
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
 2019-06-25 07:15:33 -04:00
Rolf Eike Beer
56e89e50d3 FindMatlab: simplify several if()-constructs 2019-06-24 18:33:48 +02:00