From a459a3440b9ee6e4dfa05fde849a9d7bf68646d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Tue, 18 Mar 2014 14:59:08 +0100
Subject: [PATCH] Provisions for MATLAB 8.3 (R2014a).
---
m4/ax_matlab_version.m4 | 5 ++++-
matlab/dynare_config.m | 4 ++--
windows/dynare.nsi | 12 ++++++------
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4
index 55eb57036..440af100e 100644
--- a/m4/ax_matlab_version.m4
+++ b/m4/ax_matlab_version.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2009-2013 Dynare Team
+dnl Copyright (C) 2009-2014 Dynare Team
dnl
dnl This file is part of Dynare.
dnl
@@ -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
+ *2014a | *2014A)
+ MATLAB_VERSION="8.3"
+ ;;
*2013b | *2013B)
MATLAB_VERSION="8.2"
;;
diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m
index 5b1760a44..2ca4a6794 100644
--- a/matlab/dynare_config.m
+++ b/matlab/dynare_config.m
@@ -108,7 +108,7 @@ if isoctave
else
% Add win32 specific paths for Dynare Windows package
if strcmp(computer, 'PCWIN')
- mexpath = [dynareroot '../mex/matlab/win32-7.5-8.2'];
+ mexpath = [dynareroot '../mex/matlab/win32-7.5-8.3'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
@@ -122,7 +122,7 @@ else
addpath(mexpath)
end
else
- mexpath = [dynareroot '../mex/matlab/win64-7.8-8.2'];
+ mexpath = [dynareroot '../mex/matlab/win64-7.8-8.3'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index cabf33e11..b88b4c067 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -83,9 +83,9 @@ SectionEnd
SectionGroup "MEX files for MATLAB"
-Section "MEX files for MATLAB 32-bit, version 7.5 to 8.2 (R2007b to R2013b)"
- SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.2
- File ..\mex\matlab\win32-7.5-8.2\*.mexw32
+Section "MEX files for MATLAB 32-bit, version 7.5 to 8.3 (R2007b to R2014a)"
+ SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.3
+ File ..\mex\matlab\win32-7.5-8.3\*.mexw32
SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)"
@@ -93,9 +93,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 8.2 (R2009a to R2013b)"
- SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.2
- File ..\mex\matlab\win64-7.8-8.2\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 7.8 to 8.3 (R2009a to R2014a)"
+ SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.3
+ File ..\mex\matlab\win64-7.8-8.3\*.mexw64
SectionEnd
SectionGroupEnd
--
GitLab