Changeset 9283

Timestamp:

08/11/11 10:39:04 (14 years ago)

Author:

Mathieu Morlighem

Message:

Better matlab options

Location:

issm/trunk/m4

Files:

• issm_options.m4 (modified) (3 diffs)
• matlab.m4 (modified) (1 diff)

issm/trunk/m4/issm_options.m4

@@ -47 +47 @@
         
         if test -d "$MATLAB_ROOT"; then
+
+                dnl matlab version (matlab.m4)
+                AX_MATLAB_VERSION
 
                 AC_MSG_CHECKING(for Matlab headers and libraries in $MATLAB_ROOT)
@@ -69 +72 @@
                         ;;
                         *darwin*)
-                           dnl mex -v gives all the flags for compilation of mex files
+
+                                dnl mex -v gives all the flags for compilation of mex files
+                                dnl if matlab version is 7.10 or more, we must use mexmaci64 (64 bits)
+                                MEXLINK="-O -Wl,-flat_namespace -undefined suppress -arch i386 -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map"
+                                if test $MATLAB_MAJOR -ge 7; then 
+                                         if test $MATLAB_MINOR -ge 10; then 
+                                                  MEXLINK="-O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci64/mexFunction.map"
+                                         fi
+                                fi
+
                                 MEXLIB=" mexversion.o -L$MATLAB_ROOT/bin/maci/ -lmx -lmex -lmat -lstdc++"
-                                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"
-                                MEXLINK="-O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map"
-                                dnl MEXLINK="-O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci64/mexFunction.map"
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext`
                                 MEXEXT=".$MEXEXT"
+
+                                dnl Old MEXLINK
+                                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\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"
-
 
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
@@ -107 +118 @@
         dnl should we use large arrays compilation (Matlab 7.5 and upper?)
         if test $HAVE_MATLAB = yes; then
-
-                AX_MATLAB_VERSION
                 
                 dnl  if matlab version is 7.5 and more, and if platform is x86_64, then compile with largearray

issm/trunk/m4/matlab.m4

@@ -329 +329 @@
         MATLAB_VERSION=R2010a
         MATLAB_MAJOR=7
-        MATLAB_MINOR=8
+        MATLAB_MINOR=10
         ;;
         R2010b)