Skip to content
Snippets Groups Projects
Verified Commit 77ddb342 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Provisions for MATLAB R2019a 

(manually cherry picked from commit 0f28974c)
parent 42578676
Branches
Tags
No related merge requests found
Pipeline #1030 failed
Stage: build
Stage: test
Show whitespace changes
Inline Side-by-side
m4/ax_matlab_version.m4
+ 3
− 0
View file @ 77ddb342
...@@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB]) ...@@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB])
AC_MSG_CHECKING([for MATLAB version]) AC_MSG_CHECKING([for MATLAB version])
if test "x$MATLAB_VERSION" != "x"; then if test "x$MATLAB_VERSION" != "x"; then
case $MATLAB_VERSION in case $MATLAB_VERSION in
*2019a | *2019A)
MATLAB_VERSION="9.6"
;;
*2018b | *2018B) *2018b | *2018B)
MATLAB_VERSION="9.5" MATLAB_VERSION="9.5"
;; ;;
......
windows/dynare.nsi
+ 3
− 3
View file @ 77ddb342
...@@ -103,9 +103,9 @@ Section "MEX files for MATLAB 64-bit, version 7.8 to 9.3 (R2009a to R2017b)" ...@@ -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 File ..\mex\matlab\win64-7.8-9.3\*.mexw64
SectionEnd SectionEnd
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.5 (R2018a to R2018b)" Section "MEX files for MATLAB 64-bit, version 9.4 to 9.5 (R2018a to R2019a)"
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.5 SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.6
File ..\mex\matlab\win64-9.4-9.5\*.mexw64 File ..\mex\matlab\win64-9.4-9.6\*.mexw64
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment