[Cmake-commits] CMake branch, next, updated. v3.6.2-2040-gc968768

Brad King brad.king at kitware.com
Wed Sep 14 13:08:09 EDT 2016


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  c968768c5d6658f55550ab95df6e100bebacac32 (commit)
       via  86aa6780f536bf360c73562f5b758cc7774b4e39 (commit)
      from  a37c0273b4c13741b5ab7277f1c672b2d20d2934 (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=c968768c5d6658f55550ab95df6e100bebacac32
commit c968768c5d6658f55550ab95df6e100bebacac32
Merge: a37c027 86aa678
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 13:08:08 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 14 13:08:08 2016 -0400

    Merge topic 'extend_matlab_unit_test' into next
    
    86aa6780 fixup! FindMatlab: Extend matlab_add_unit_test to run arbitrary test code


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86aa6780f536bf360c73562f5b758cc7774b4e39
commit 86aa6780f536bf360c73562f5b758cc7774b4e39
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 13:07:13 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 14 13:07:13 2016 -0400

    fixup! FindMatlab: Extend matlab_add_unit_test to run arbitrary test code

diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
index 0bd16c8..76f9a53 100644
--- a/Modules/MatlabTestsRedirect.cmake
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -80,8 +80,8 @@ if(NOT working_directory)
   set(working_directory "${output_directory}")
 endif()
 
-string(REPLACE "/" "_" log_file_name "${test_name}")
-set(Matlab_LOG_FILE "${working_directory}/${log_file_name}.log")
+string(REPLACE "/" "_" log_file_name "${test_name}.log")
+set(Matlab_LOG_FILE "${working_directory}/${log_file_name}")
 
 set(devnull)
 if(UNIX)

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list