Changeset 19111

Timestamp:

02/13/15 18:30:04 (10 years ago)

Author:

glperez

Message:

CHG: issm_options.m4 change to keep non Windows build from setting IS_WINDOWS to yes.

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -275 +275 @@
                                         MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
                                         MEXEXT=".$MEXEXT"
+                                        IS_WINDOWS=yes
                                 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,/export:mexFunction -Wl,/LD" 
                                         MEXEXT=".mexw64"
+                                        IS_WINDOWS=yes
                                 elif test $VENDOR = MSVC-Win64; 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,/export:mexFunction -Wl,/LD" 
                                         MEXEXT=".mexw64"
+                                        IS_WINDOWS=yes
                                 fi
-                                IS_WINDOWS=yes
-
                         ;;
                    *)