From bee5330069a85491899e15cf3cd4e5aea12bb4b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?=
<stephane.adjemian@univ-lemans.fr>
Date: Tue, 17 Oct 2017 17:55:09 +0200
Subject: [PATCH] Account for matlab R2017b.
(cherry picked from commit 798c22fb6e92dd6b11398563369a86bb08e04461)
---
m4/ax_matlab_version.m4 | 3 +++
matlab/add_path_to_mex_files.m | 2 +-
windows/dynare.nsi | 6 +++---
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4
index 6f01df9f2..603b29945 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
+ *2017b | *2017B)
+ MATLAB_VERSION="9.3"
+ ;;
*2017a | *2017A)
MATLAB_VERSION="9.2"
;;
diff --git a/matlab/add_path_to_mex_files.m b/matlab/add_path_to_mex_files.m
index 13140bba5..0e5ddc5ed 100644
--- a/matlab/add_path_to_mex_files.m
+++ b/matlab/add_path_to_mex_files.m
@@ -52,7 +52,7 @@ else
end
end
else
- tmp = [dynareroot '../mex/matlab/win64-7.8-9.2/'];
+ tmp = [dynareroot '../mex/matlab/win64-7.8-9.3/'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index 60b575149..cf4b39491 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -98,9 +98,9 @@ Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)"
File ..\mex\matlab\win64-7.5-7.7\*.mexw64
SectionEnd
-Section "MEX files for MATLAB 64-bit, version 7.8 to 9.2 (R2009a to R2017a)"
- SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.2
- File ..\mex\matlab\win64-7.8-9.2\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 7.8 to 9.3 (R2009a to R2017b)"
+ SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.3
+ File ..\mex\matlab\win64-7.8-9.3\*.mexw64
SectionEnd
SectionGroupEnd
--
GitLab