[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-813-g2d2bec4

[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  2d2bec4b3d42deff6f8a9b529967fb80fc1465a8 (commit)
       via  f2de70799c91924a5185a9a85ed4f5dabc47ca51 (commit)
      from  940627da617082b135d09ee3712970fc42f00aa2 (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=2d2bec4b3d42deff6f8a9b529967fb80fc1465a8
commit 2d2bec4b3d42deff6f8a9b529967fb80fc1465a8
Merge: 940627d f2de707
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 28 15:21:14 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 28 15:21:14 2016 -0400

    Merge topic 'FindMatlab-fix-typo' into next
    
    f2de7079 FindMatlab: Fix typo in matlab_add_unit_test implementation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2de70799c91924a5185a9a85ed4f5dabc47ca51
commit f2de70799c91924a5185a9a85ed4f5dabc47ca51
Author:     Matthew Woehlke <matthew.woehlke at kitware.com>
AuthorDate: Fri Oct 28 13:40:58 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 28 15:19:24 2016 -0400

    FindMatlab: Fix typo in matlab_add_unit_test implementation
    
    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).

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index b7f2db5..670bfb3 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -793,7 +793,7 @@ function(matlab_add_unit_test)
             "-Dworking_directory=${${prefix}_WORKING_DIRECTORY}"
             "-DMatlab_PROGRAM=${Matlab_MAIN_PROGRAM}"
             "-Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}"
-            "-DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}"
+            "-DMatlab_ADDITIONAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}"
             "-Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}"
             "-Dcustom_Matlab_test_command=${${prefix}_CUSTOM_TEST_COMMAND}"
             "-Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}"
diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
index a0c6621..64d580d 100644
--- a/Modules/MatlabTestsRedirect.cmake
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -10,14 +10,14 @@
 #   -Dadditional_paths=""
 #   -Dno_unittest_framework=""
 #   -DMatlab_PROGRAM=matlab_exe_location
-#   -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=""
+#   -DMatlab_ADDITIONAL_STARTUP_OPTIONS=""
 #   -Dtest_name=name_of_the_test
 #   -Dcustom_Matlab_test_command=""
 #   -Dcmd_to_run_before_test=""
 #   -Dunittest_file_to_run
 #   -P FindMatlab_TestsRedirect.cmake
 
-set(Matlab_UNIT_TESTS_CMD -nosplash -nodesktop -nodisplay ${Matlab_ADDITIONNAL_STARTUP_OPTIONS})
+set(Matlab_UNIT_TESTS_CMD -nosplash -nodesktop -nodisplay ${Matlab_ADDITIONAL_STARTUP_OPTIONS})
 if(WIN32)
   set(Matlab_UNIT_TESTS_CMD ${Matlab_UNIT_TESTS_CMD} -wait)
 endif()

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

Summary of changes:
 Modules/FindMatlab.cmake          |    2 +-
 Modules/MatlabTestsRedirect.cmake |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake