Changeset 20403

Timestamp:

03/31/16 10:27:27 (9 years ago)

Author:

glperez

Message:

CHG: Fixed MATLABINCLUDE variable for Windows.

File:

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

issm/trunk-jpl/m4/issm_options.m4 ¶

@@ -281 +281 @@
 
                 AC_DEFINE([_HAVE_MATLAB_],[1],[with matlab in ISSM src])
-                MATLABINCL="-I$MATLAB_ROOT/extern/include/"
                 
                 dnl 4. get MEXLIB MEXLINK and MEXEXT (experimental) except for windows
@@ -299 +298 @@
                                         MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
                MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/link -Wl,/EXPORT:mexFunction -Wl,/DLL" 
+                                        MATLABINCL="-I`cygpath -m $MATLAB_ROOT/extern/include/`"
                                         MEXEXT=".mexw64"
                                 fi
                         ;;
                    *)
+           MATLABINCL="-I$MATLAB_ROOT/extern/include/"
            MEXLINK=$($MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDFLAGS     | sed -e "s/         LDFLAGS            = //g")
                           MEXLIB=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep CXXLIBS     | sed -e "s/         CXXLIBS            = //g")