[Cmake-commits] CMake branch, next, updated. v3.1.3-1349-gd922c38

Brad King brad.king at kitware.com
Fri Feb 13 10:55:02 EST 2015


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  d922c38efd6f1dfc0ab877e1993145a9a42fba79 (commit)
       via  5e91eb438847eae47b807528ef694e8e7d868195 (commit)
       via  ba3057efee7bd1ea37fb70d9e57b0c5be36c24d7 (commit)
      from  1e8cab716d3bc5971daf5360e67b12728f34afa2 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d922c38efd6f1dfc0ab877e1993145a9a42fba79
commit d922c38efd6f1dfc0ab877e1993145a9a42fba79
Merge: 1e8cab7 5e91eb4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 10:55:01 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 10:55:01 2015 -0500

    Merge topic 'FindMatlab-rewrite' into next
    
    5e91eb43 FindMatlab: Quote variable references in macro calls
    ba3057ef FindMatlab: Fix ModuleNotices test for MatlabTestsRedirect


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e91eb438847eae47b807528ef694e8e7d868195
commit 5e91eb438847eae47b807528ef694e8e7d868195
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 10:54:10 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 13 10:54:48 2015 -0500

    FindMatlab: Quote variable references in macro calls
    
    Make sure they are treated as exactly one argument to the macro.

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index a821826..7b78886 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -967,7 +967,7 @@ if(WIN32)
     endif()
 
     # filtering the results with the registry keys
-    matlab_get_all_valid_matlab_roots_from_registry(${matlab_versions_from_registry} _matlab_possible_roots)
+    matlab_get_all_valid_matlab_roots_from_registry("${matlab_versions_from_registry}" _matlab_possible_roots)
 
 
 
@@ -1057,7 +1057,7 @@ else()
         set(_matlab_full_string "/Applications/MATLAB_${_matlab_current_release}.app")
         if(EXISTS ${_matlab_full_string})
           set(_matlab_current_version)
-          matlab_get_version_from_release_name(${_matlab_current_release} _matlab_current_version)
+          matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version)
           if(MATLAB_FIND_DEBUG)
             message(STATUS "[MATLAB] Found version ${_matlab_current_release} (${_matlab_current_version}) in ${_matlab_full_string}")
           endif()
@@ -1132,7 +1132,7 @@ if(${Matlab_VERSION_STRING} STREQUAL "NOTFOUND")
 
     if(Matlab_MAIN_PROGRAM)
       set(matlab_list_of_all_versions)
-      matlab_get_version_from_matlab_run(${Matlab_MAIN_PROGRAM} matlab_list_of_all_versions)
+      matlab_get_version_from_matlab_run("${Matlab_MAIN_PROGRAM}" matlab_list_of_all_versions)
 
       list(GET matlab_list_of_all_versions 0 MATLAB_VERSION_tmp)
 
@@ -1204,7 +1204,7 @@ unset(_matlab_64Build)
 
 if(NOT DEFINED Matlab_MEX_EXTENSION)
   set(_matlab_mex_extension "")
-  matlab_get_mex_suffix(${Matlab_ROOT_DIR} _matlab_mex_extension)
+  matlab_get_mex_suffix("${Matlab_ROOT_DIR}" _matlab_mex_extension)
 
   # This variable goes to the cache.
   set(Matlab_MEX_EXTENSION ${_matlab_mex_extension} CACHE STRING "Extensions for the mex targets (automatically given by Matlab)")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba3057efee7bd1ea37fb70d9e57b0c5be36c24d7
commit ba3057efee7bd1ea37fb70d9e57b0c5be36c24d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 13 10:49:39 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 13 10:54:45 2015 -0500

    FindMatlab: Fix ModuleNotices test for MatlabTestsRedirect
    
    Add a note that the module is undocumented.

diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
index 29a8bfa..46d1ef8 100644
--- a/Modules/MatlabTestsRedirect.cmake
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -1,3 +1,6 @@
+# This is an undocumented internal helper for the FindMatlab
+# module ``matlab_add_unit_test`` command.
+
 #=============================================================================
 # Copyright 2014-2015 Raffi Enficiaud, Max Planck Society
 #

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list