diff options
| author | Sean Warren <s.warren@garvan.org.au> | 2018-09-26 05:18:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-26 11:54:50 (GMT) |
| commit | 62709beff8e9bf786b9c3ec5fbd791ce2d452232 (patch) | |
| tree | 1db8481e442b8e38fd8d0a8f14b81d5caf5bb9c7 | |
| parent | 9a56ed3438f652ec526afabeab87e04f330e4724 (diff) | |
| download | CMake-62709beff8e9bf786b9c3ec5fbd791ce2d452232.zip CMake-62709beff8e9bf786b9c3ec5fbd791ce2d452232.tar.gz CMake-62709beff8e9bf786b9c3ec5fbd791ce2d452232.tar.bz2 | |
FindMatlab: Add Matlab 2018a,b to version list
| -rw-r--r-- | Help/release/dev/FindMatlab-2018b.rst | 3 | ||||
| -rw-r--r-- | Modules/FindMatlab.cmake | 2 |
2 files changed, 5 insertions, 0 deletions
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" |