Changeset 11523

Timestamp:

02/23/12 22:56:11 (13 years ago)

Author:

Eric.Larour

Message:

vendor m4 macros needed to determine whether we are running 32 or 64 bits Matlab.
Also need two differentiated win7 configuration files.

Location:

issm/trunk-jpl

Files:

• configs/config-win7-32.sh (added)
• configs/config-win7-64.sh (added)
• configs/config-win7.sh (deleted)
• m4/issm_options.m4 (modified) (3 diffs)

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

@@ -42 +42 @@
 
         dnl ISSM's externalpackages
+        dnl vendor{{{1
+        AC_ARG_WITH([vendor],
+                          AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]), [VENDOR=$withval],[VENDOR=""]) 
+        AC_MSG_CHECKING(for vendor compilers)
+        if test -n "$VENDOR"; then
+
+                if  test $VENDOR = intel-win32; then
+                        export CC=icl
+                        export CXX=icl
+                        export CFLAGS="-DWIN32 -D_INTEL_WIN_"
+                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_"
+                elif  test $VENDOR = intel-win7-32; then
+                        export CC=cccl
+                        export CXX=cccl
+                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export AR=lib
+                        export RANLIB=true
+                        OSLIBS="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"
+                elif  test $VENDOR = intel-win7-64; then
+                        export CC=cccl
+                        export CXX=cccl
+                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export AR=lib
+                        export RANLIB=true
+                        OSLIBS="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"
+                elif test $VENDOR = intel-linux; then
+                        export CC=icc
+                        export CXX=icpc
+                        export CFLAGS=" -D_INTEL_LINUX_"
+                        export CXXFLAGS=" -D_INTEL_LINUX_"
+                elif test $VENDOR = intel-pleiades; then
+                        export CC=icc
+                        export CXX=icpc
+                        export CXXFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
+                        export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
+                else
+                AC_MSG_ERROR([unknow compiler vendor!])
+                fi
+        fi
+        AC_SUBST([OSLIBS]) 
+        AC_MSG_RESULT(done)
+        dnl }}}
         dnl Matlab {{{1
         AC_ARG_WITH([matlab-dir],
@@ -92 +136 @@
                                 dnl MEXLINK="-Wl,-twolevel_namespace -undefined error -arch i386 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map"
                         ;;
-                        *cygwin*)
-                                MEXLIB="-dll -export:mexFunction -LIBPATH:\"$MATLAB_ROOT\extern\lib\win64\microsoft\" libmx.lib libmex.lib libmat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  -NOLOGO -INCREMENTAL:NO -manifest" 
-
-
+                        *cygwin*) 
+                                if  test $VENDOR = intel-win7-32; then
+                                        MEXLIB="-dll -export:mexFunction -LIBPATH:\"$MATLAB_ROOT\extern\lib\win32\microsoft\" libmx.lib libmex.lib libmat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  -NOLOGO -INCREMENTAL:NO -manifest" 
+                                elif  test $VENDOR = intel-win7-64; then
+                                        MEXLIB="-dll -export:mexFunction -LIBPATH:\"$MATLAB_ROOT\extern\lib\win64\microsoft\" libmx.lib libmex.lib libmat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  -NOLOGO -INCREMENTAL:NO -manifest" 
+                                fi
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
                                 MEXEXT=".$MEXEXT"
@@ -844 +890 @@
         AC_MSG_RESULT(done)
         dnl }}}
-        dnl vendor{{{1
-        AC_ARG_WITH([vendor],
-                          AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]), [VENDOR=$withval],[VENDOR=""]) 
-        AC_MSG_CHECKING(for vendor compilers)
-        if test -n "$VENDOR"; then
-
-                if  test $VENDOR = intel-win32; then
-                        export CC=icl
-                        export CXX=icl
-                        export CFLAGS="-DWIN32 -D_INTEL_WIN_"
-                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_"
-                elif  test $VENDOR = intel-win7; then
-                        export CC=cccl
-                        export CXX=cccl
-                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
-                        export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
-                        export AR=lib
-                        export RANLIB=true
-                        OSLIBS="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"
-                elif test $VENDOR = intel-linux; then
-                        export CC=icc
-                        export CXX=icpc
-                        export CFLAGS=" -D_INTEL_LINUX_"
-                        export CXXFLAGS=" -D_INTEL_LINUX_"
-                elif test $VENDOR = intel-pleiades; then
-                        export CC=icc
-                        export CXX=icpc
-                        export CXXFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
-                        export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
-                else
-                AC_MSG_ERROR([unknow compiler vendor!])
-                fi
-        fi
-        AC_SUBST([OSLIBS]) 
-        AC_MSG_RESULT(done)
-        dnl }}}
         dnl with-steadystate{{{1
         AC_ARG_WITH([steadystate],AS_HELP_STRING([--with-steadystate = YES], [compile with steadystate capabilities (default is yes)]),[STEADYSTATE=$withval],[STEADYSTATE=yes])