summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-04-08 13:42:17 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-04-08 13:42:17 (GMT)
commitf3be6c1b9b3df6f1121e578807f06c29a003c58d (patch)
tree340f2f46ea4f266901f3677795bf2b2bcaefe3f5 /Modules
parent977796e3077b390b72c32315138ca15ae3339fb7 (diff)
parent7e311773b5386663457bedd39cf2110da04438f2 (diff)
downloadCMake-f3be6c1b9b3df6f1121e578807f06c29a003c58d.zip
CMake-f3be6c1b9b3df6f1121e578807f06c29a003c58d.tar.gz
CMake-f3be6c1b9b3df6f1121e578807f06c29a003c58d.tar.bz2
Merge topic 'FindMatlab_add_recent_versions'
7e311773 FindMatlab: Look for R2014b and R2015a
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindMatlab.cmake2
1 files changed, 2 insertions, 0 deletions
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"