Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Golden
CMake
Commits
914c470a
Commit
914c470a
authored
8 years ago
by
Brad King
Browse files
Options
Downloads
Plain Diff
Merge branch 'FindMatlab-documentation' into release
parents
1bc8a66d
f2b88600
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Help/release/3.7.rst
+8
-1
8 additions, 1 deletion
Help/release/3.7.rst
Modules/FindMatlab.cmake
+7
-8
7 additions, 8 deletions
Modules/FindMatlab.cmake
with
15 additions
and
9 deletions
Help/release/3.7.rst
+
8
−
1
View file @
914c470a
...
...
@@ -176,7 +176,14 @@ Modules
* A :module:`FindICU` module was introduced to find the International
Components for Unicode (ICU) libraries and programs.
* The :module:`FindMatlab` module learned to find a SIMULINK component.
* The :module:`FindMatlab` module learned to find the SIMULINK and MAT
components.
* The :module:`FindMatlab` module :command:`matlab_add_mex` command learned
to add executables and modules.
* The :module:`FindMatlab` module :command:`matlab_add_unit_test` command
learned to support inline Matlab test code.
* The :module:`FindOpenCL` module now provides imported targets.
...
...
This diff is collapsed.
Click to expand it.
Modules/FindMatlab.cmake
+
7
−
8
View file @
914c470a
...
...
@@ -737,9 +737,9 @@ endfunction()
# added to the Matlab path.
# ``CUSTOM_MATLAB_COMMAND``
# Matlab script command to run as the test.
#
I
If this is not set, then the following is run:
#
"
runtests('matlab_file_name'), exit(max([ans(1,:).Failed]))
# matlab_file_name
comes from
UNITTEST_FILE without the
.m
.
# If this is not set, then the following is run:
#
``
runtests('matlab_file_name'), exit(max([ans(1,:).Failed]))
``
#
where ``
matlab_file_name
`` is the ``
UNITTEST_FILE
``
without the
extension
.
# ``UNITTEST_PRECOMMAND``
# Matlab script command to be ran before the file
# containing the test (eg. GPU device initialisation based on CMake
...
...
@@ -753,7 +753,7 @@ endfunction()
# ``MATLAB_ADDITIONAL_STARTUP_OPTIONS``
# a list of additional option in order
# to run Matlab from the command line.
# -nosplash -nodesktop -nodisplay are always added.
#
``
-nosplash -nodesktop -nodisplay
``
are always added.
# ``TEST_ARGS``
# Additional options provided to the add_test command. These
# options are added to the default options (eg. "CONFIGURATIONS Release")
...
...
@@ -763,7 +763,7 @@ endfunction()
# ``WORKING_DIRECTORY``
# This will be the working directory for the test. If specified it will
# also be the output directory used for the log file of the test run.
# If not specifed the temporary directory ${CMAKE_BINARY_DIR}/Matlab will
# If not specifed the temporary directory
``
${CMAKE_BINARY_DIR}/Matlab
``
will
# be used as the working directory and the log location.
#
function
(
matlab_add_unit_test
)
...
...
@@ -844,7 +844,6 @@ endfunction()
# the same folder without any processing, with the same name as the final
# mex file, and with extension `.m`. In that case, typing ``help <name>``
# in Matlab prints the documentation contained in this file.
#
# ``MODULE`` or ``SHARED`` may be given to specify the type of library to be
# created. ``EXECUTABLE`` may be given to create an executable instead of
# a library. If no type is given explicitly, the type is ``SHARED``.
...
...
@@ -1246,8 +1245,8 @@ if(_numbers_of_matlab_roots GREATER 0)
endif
()
# check if the root changed
against
the previous defined one, if so
# clear all the cached variables
# check if the root changed
wrt.
the previous defined one, if so
# clear all the cached variables
for being able to reconfigure properly
if
(
DEFINED Matlab_ROOT_DIR_LAST_CACHED
)
if
(
NOT Matlab_ROOT_DIR_LAST_CACHED STREQUAL Matlab_ROOT_DIR
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment