Changeset 18119

Timestamp:

06/06/14 13:41:27 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added support for matlab 2014+ mex

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (3 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -168 +168 @@
                 
                 dnl 4. get MEXLIB MEXLINK and MEXEXT (experimental) except for windows
+                AC_MSG_CHECKING([matlab's mex compilation flags])
                 case "${host_os}" in
                         *cygwin*) 
@@ -184 +185 @@
                  MEXLIB=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep CXXLIBS     | sed -e "s/         CXXLIBS            = //g")
                       MEXEXT=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDEXTENSION | sed -e "s/         LDEXTENSION        = //g")
+
+                                dnl version 2014 and up
+                                if test "x$MEXEXT" = "x" ; then
+                                         echo "#include <mex.h>" > conftest.cpp
+                                         echo "void mexFunction(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){}" >> conftest.cpp
+                                         $MATLAB_ROOT/bin/mex -v -lmex conftest.cpp > conftest.tmp 2>&1 
+                                         rm -f conftest.cpp
+                                         MEXLINK=$(cat conftest.tmp | grep LDFLAGS  | sed -e "s/LDFLAGS ://g")
+                                         MEXLIB=$( cat conftest.tmp | grep LINKLIBS | sed -e "s/LINKLIBS ://g")
+                                         MEXEXT=$( cat conftest.tmp | grep LDEXT    | sed -e "s/LDEXT ://g" | awk '{print $[1]}')
+                                         rm -f conftest.tmp
+                                fi
+
                         ;;
       esac
+                AC_MSG_RESULT(done)
            if test "x$MEXEXT" = "x" ; then
                         AC_MSG_ERROR([Couldn't find mex... check your installation of matlab])
@@ -191 +206 @@
 
                 AC_SUBST([MATLABINCL])
-                AC_SUBST([MEX])
                 MATLABWRAPPEREXT=$MEXEXT
                 AC_SUBST([MATLABWRAPPEREXT])