summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-05 14:04:07 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-10-05 14:04:07 (GMT)
commit99c7c23abe6342ca2ecab1f04cf396362bd56930 (patch)
treedc2349ff0807f650d2f3fbffaf9797a40a7dc9bb
parenta57f5abdf667544b15bee6eb75e92fc806a6e763 (diff)
parent2775768f348bb082d1b2f1d8793f65ba832dc8df (diff)
downloadCMake-99c7c23abe6342ca2ecab1f04cf396362bd56930.zip
CMake-99c7c23abe6342ca2ecab1f04cf396362bd56930.tar.gz
CMake-99c7c23abe6342ca2ecab1f04cf396362bd56930.tar.bz2
Merge topic 'FindMatlab-v8.6'
2775768f FindMatlab: Add support for Matlab R2015b
-rw-r--r--Modules/FindMatlab.cmake1
1 files changed, 1 insertions, 0 deletions
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"