[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-74-g44a0a9a

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  44a0a9aac4193a647842da6c4298677f9753e7c3 (commit)
       via  f2b88600f374684e66cbe91697dfed09798ac5b8 (commit)
       via  2f16ab87aeb58525f723ce5f5dc84e1f7730a8b3 (commit)
      from  eff4fa9738cfaaf5fe7d7cdd3d4983bf0cfbee10 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44a0a9aac4193a647842da6c4298677f9753e7c3
commit 44a0a9aac4193a647842da6c4298677f9753e7c3
Merge: eff4fa9 f2b8860
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 5 09:44:24 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 5 09:44:24 2016 -0400

    Merge topic 'FindMatlab-documentation' into next
    
    f2b88600 Help: Extend 3.7 release notes for FindMatlab
    2f16ab87 FindMatlab: small documentation fixes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2b88600f374684e66cbe91697dfed09798ac5b8
commit f2b88600f374684e66cbe91697dfed09798ac5b8
Author:     Raffi Enficiaud <raffi.enficiaud at mines-paris.org>
AuthorDate: Wed Oct 5 09:32:56 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 5 09:43:09 2016 -0400

    Help: Extend 3.7 release notes for FindMatlab

diff --git a/Help/release/3.7.rst b/Help/release/3.7.rst
index f02b62d..9794267 100644
--- a/Help/release/3.7.rst
+++ b/Help/release/3.7.rst
@@ -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.
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f16ab87aeb58525f723ce5f5dc84e1f7730a8b3
commit 2f16ab87aeb58525f723ce5f5dc84e1f7730a8b3
Author:     Raffi Enficiaud <raffi.enficiaud at mines-paris.org>
AuthorDate: Wed Oct 5 09:20:59 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 5 09:39:27 2016 -0400

    FindMatlab: small documentation fixes

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 6beacce..e1ae83f 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -737,9 +737,9 @@ endfunction()
 #     added to the Matlab path.
 #   ``CUSTOM_MATLAB_COMMAND``
 #     Matlab script command to run as the test.
-#     IIf 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)

-----------------------------------------------------------------------

Summary of changes:
 Help/release/3.7.rst     |    9 ++++++++-
 Modules/FindMatlab.cmake |   15 +++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake