From 77ddb34219513d0b00ea4490d46a19a5b83cadda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Fri, 22 Mar 2019 15:44:29 +0100
Subject: [PATCH] Provisions for MATLAB R2019a
(manually cherry picked from commit 0f28974c2c15545b4d867aa0c3e92540b6f0042a)
---
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 cbd6325b10..e36a9c949f 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
+ *2019a | *2019A)
+ MATLAB_VERSION="9.6"
+ ;;
*2018b | *2018B)
MATLAB_VERSION="9.5"
;;
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index dfcfd6eedb..f796004861 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 to 9.5 (R2018a to R2018b)"
- SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.5
- File ..\mex\matlab\win64-9.4-9.5\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 9.4 to 9.5 (R2018a to R2019a)"
+ SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.6
+ File ..\mex\matlab\win64-9.4-9.6\*.mexw64
SectionEnd
SectionGroupEnd
--
GitLab