Changeset 20414

Timestamp:

03/31/16 14:52:43 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed MATLAB_DIR

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -288 +288 @@
                                 if  test $VENDOR = intel-win7-32; then
                                         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/win32/microsoft` -Wl,/link -Wl,/EXPORT:mexFunction -Wl,/DLL"
+               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_ROOT}/extern/lib/win32/microsoft` -Wl,/link -Wl,/EXPORT:mexFunction -Wl,/DLL"
                                         MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
                                         MEXEXT=".$MEXEXT"
                                 elif test $VENDOR = intel-win7-64; then
                                         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" 
+               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_ROOT}/extern/lib/win64/microsoft` -Wl,/link -Wl,/EXPORT:mexFunction -Wl,/DLL" 
                                         MEXEXT=".mexw64"
                                 elif test $VENDOR = MSVC-Win64 || test $VENDOR = MSVC-Win64-par; then