[Cmake-commits] CMake branch, next, updated. v3.3.2-3479-g8989d26
Brad King
brad.king at kitware.com
Mon Oct 5 09:16:40 EDT 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 8989d268cfea91747d054a4820054ddd26af864e (commit)
via 2775768f348bb082d1b2f1d8793f65ba832dc8df (commit)
from 32f9ebcfd62deafd542c9b5d408ce0c6b7cadf87 (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=8989d268cfea91747d054a4820054ddd26af864e
commit 8989d268cfea91747d054a4820054ddd26af864e
Merge: 32f9ebc 2775768
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 5 09:16:39 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 5 09:16:39 2015 -0400
Merge topic 'FindMatlab-v8.6' into next
2775768f FindMatlab: Add support for Matlab R2015b
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2775768f348bb082d1b2f1d8793f65ba832dc8df
commit 2775768f348bb082d1b2f1d8793f65ba832dc8df
Author: Francesco Romano <francesco.romano.1987 at gmail.com>
AuthorDate: Sat Oct 3 10:49:16 2015 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 5 09:16:14 2015 -0400
FindMatlab: Add support for Matlab R2015b
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index a47a69c..7a36719 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -229,6 +229,7 @@ if(NOT MATLAB_ADDITIONAL_VERSIONS)
endif()
set(MATLAB_VERSIONS_MAPPING
+ "R2015b=8.6"
"R2015a=8.5"
"R2014b=8.4"
"R2014a=8.3"
-----------------------------------------------------------------------
Summary of changes:
Modules/FindMatlab.cmake | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list