From 62709beff8e9bf786b9c3ec5fbd791ce2d452232 Mon Sep 17 00:00:00 2001
From: Sean Warren <s.warren@garvan.org.au>
Date: Wed, 26 Sep 2018 15:18:24 +1000
Subject: FindMatlab: Add Matlab 2018a,b to version list

---
 Help/release/dev/FindMatlab-2018b.rst | 3 +++
 Modules/FindMatlab.cmake              | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/Help/release/dev/FindMatlab-2018b.rst b/Help/release/dev/FindMatlab-2018b.rst
index 28758f1..c698b9d 100644
--- a/Help/release/dev/FindMatlab-2018b.rst
+++ b/Help/release/dev/FindMatlab-2018b.rst
@@ -7,3 +7,6 @@ FindMatlab-2018b
 
 * The :module:`FindMatlab` module now explicitly exports mexFunction in Visual
   Studio.
+
+* The :module:`FindMatlab` module gained the ability to discover Matlab R2018a
+  and R2018b.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index da832ce..547a330 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -242,6 +242,8 @@ if(NOT MATLAB_ADDITIONAL_VERSIONS)
 endif()
 
 set(MATLAB_VERSIONS_MAPPING
+  "R2018b=9.5"
+  "R2018a=9.4"
   "R2017b=9.3"
   "R2017a=9.2"
   "R2016b=9.1"
-- 
cgit v0.12