From 4f3b35acbaaa23ad81d5200f68eacbbd9c9b98b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?= <stephane.adjemian@univ-lemans.fr> Date: Mon, 13 Mar 2017 17:18:18 +0100 Subject: [PATCH] Account for Matlab 2017a. (cherry picked from commit f3a1619040fbb831830791424015d3d3bf8bdbae) --- 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 282d2ad547..6f01df9f2b 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 + *2017a | *2017A) + MATLAB_VERSION="9.2" + ;; *2016b | *2016B) MATLAB_VERSION="9.1" ;; diff --git a/matlab/add_path_to_mex_files.m b/matlab/add_path_to_mex_files.m index 38da0d345a..c7d89036d7 100644 --- a/matlab/add_path_to_mex_files.m +++ b/matlab/add_path_to_mex_files.m @@ -48,7 +48,7 @@ else end end else - tmp = [dynareroot '../mex/matlab/win64-7.8-9.1/']; + tmp = [dynareroot '../mex/matlab/win64-7.8-9.2/']; if exist(tmp, 'dir') mexpath = tmp; if modifypath diff --git a/windows/dynare.nsi b/windows/dynare.nsi index c72bc4c0fd..17da23751d 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.1 (R2009a to R2016b)" - SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.1 - File ..\mex\matlab\win64-7.8-9.1\*.mexw64 +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 SectionEnd SectionGroupEnd -- GitLab