summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-10-05 11:34:18 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-10-05 11:34:49 (GMT)
commitdbb16722ee0669b52ef15b4ee35c7ca623e400c9 (patch)
tree2a63591b5943897822dc28e2dfd1a32d43ba14e4
parent508f47de1b4b7ab52abf17bc4feb39637a4005c2 (diff)
parentf156b2fbfb0cc53a3b29f31942ba7e8f0d2a9184 (diff)
downloadCMake-dbb16722ee0669b52ef15b4ee35c7ca623e400c9.zip
CMake-dbb16722ee0669b52ef15b4ee35c7ca623e400c9.tar.gz
CMake-dbb16722ee0669b52ef15b4ee35c7ca623e400c9.tar.bz2
Merge topic 'find-matlab-r2017b'
f156b2fb FindMatlab: Add support for MATLAB 2017b Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raffi Enficiaud <raffi.enficiaud@free.fr> Merge-request: !1343
-rw-r--r--Modules/FindMatlab.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index d287688..7d4ed6a 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -225,6 +225,7 @@ if(NOT MATLAB_ADDITIONAL_VERSIONS)
endif()
set(MATLAB_VERSIONS_MAPPING
+ "R2017b=9.3"
"R2017a=9.2"
"R2016b=9.1"
"R2016a=9.0"
@@ -236,7 +237,6 @@ set(MATLAB_VERSIONS_MAPPING
"R2013a=8.1"
"R2012b=8.0"
"R2012a=7.14"
-
"R2011b=7.13"
"R2011a=7.12"
"R2010b=7.11"