[Cmake-commits] CMake branch, next, updated. v3.2.1-1568-gc19af05

[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  c19af05c6a04482dca164a44fbcc326e591b06fd (commit)
       via  7e311773b5386663457bedd39cf2110da04438f2 (commit)
      from  72847dde8e43bb6417d802bf4c5dbff62390b574 (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=c19af05c6a04482dca164a44fbcc326e591b06fd
commit c19af05c6a04482dca164a44fbcc326e591b06fd
Merge: 72847dd 7e31177
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 7 14:00:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 7 14:00:56 2015 -0400

    Merge topic 'FindMatlab_add_recent_versions' into next
    
    7e311773 FindMatlab: Look for R2014b and R2015a


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e311773b5386663457bedd39cf2110da04438f2
commit 7e311773b5386663457bedd39cf2110da04438f2
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Tue Apr 7 11:42:02 2015 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Tue Apr 7 11:42:02 2015 +0200

    FindMatlab: Look for R2014b and R2015a

diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index d08423b..b4beec3 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -228,6 +228,8 @@ if(NOT MATLAB_ADDITIONAL_VERSIONS)
 endif()
 
 set(MATLAB_VERSIONS_MAPPING
+  "R2015a=8.5"
+  "R2014b=8.4"
   "R2014a=8.3"
   "R2013b=8.2"
   "R2013a=8.1"

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

Summary of changes:
 Modules/FindMatlab.cmake |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake