From 24cb1c071949e83a8709b3cd6784ff0c5b947220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Mon, 1 Oct 2018 18:26:03 +0200
Subject: [PATCH] Provisions for MATLAB R2018b (9.5)
---
m4/ax_matlab_version.m4 | 3 +++
windows/dynare.nsi | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4
index 1004b91b9e..cbd6325b10 100644
--- a/m4/ax_matlab_version.m4
+++ b/m4/ax_matlab_version.m4
@@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB])
AC_MSG_CHECKING([for MATLAB version])
if test "x$MATLAB_VERSION" != "x"; then
case $MATLAB_VERSION in
+ *2018b | *2018B)
+ MATLAB_VERSION="9.5"
+ ;;
*2018a | *2018A)
MATLAB_VERSION="9.4"
;;
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index 7bad24fd4d..2b7cf76013 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -103,9 +103,9 @@ Section "MEX files for MATLAB 64-bit, version 7.8 to 9.3 (R2009a to R2017b)"
File ..\mex\matlab\win64-7.8-9.3\*.mexw64
SectionEnd
-Section "MEX files for MATLAB 64-bit, version 9.4 (R2018a)"
- SetOutPath $INSTDIR\mex\matlab\win64-9.4
- File ..\mex\matlab\win64-9.4\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 9.4 to 9.5 (R2018a to R2018b)"
+ SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.5
+ File ..\mex\matlab\win64-9.4-9.5\*.mexw64
SectionEnd
SectionGroupEnd
--
GitLab