Changeset 15288

Timestamp:

06/19/13 22:17:44 (12 years ago)

Author:

glperez

Message:

CHG: Changes for Windows build using Libtool.

Location:

issm/trunk-jpl

Files:

• configs/config-win7-32.sh (modified) (2 diffs)
• m4/issm_options.m4 (modified) (5 diffs)
• src/wrappers/matlab/Makefile.am (modified) (2 diffs)

issm/trunk-jpl/configs/config-win7-32.sh

@@ -6 +6 @@
         --with-vendor=intel-win7-32  \
         --with-matlab-dir="$MATLAB_DIR" \
+   --with-blas-lapack-dir="$ISSM_DIR/externalpackages/petsc/install" \
         --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
         --with-metis-dir="$ISSM_DIR/externalpackages/metis/install" \
@@ -11 +12 @@
         --with-petsc-arch=$ISSM_ARCH  \
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/  \
-        --with-mpi-lib="$ISSM_DIR/externalpackages/petsc/install/lib/libpetsc.lib" \
+        --with-mpi-lib="-Wl,libpetsc.lib" \
         --with-mpi-include="$ISSM_DIR/externalpackages/petsc/install/include/mpiuni" 

issm/trunk-jpl/m4/issm_options.m4

@@ -124 +124 @@
                         *cygwin*) 
                                 if  test $VENDOR = intel-win7-32; then
-                                        MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib -Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
-               MEXLINK="-no-undefined /link /DLL -export:mexFunction" 
+                                        MEXLIB="-Wl,./../../c/libISSMCore.a -Wl,libISSMApi.a -Wl,libISSMMatlab.a -Wl,./../../c/libISSMModules.a -Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
+               MEXLINK="-no-undefined -Wl,/export:mexFunction" 
                                 elif  test $VENDOR = intel-win7-64; then
-                                        MEXLIB="/DLL -export:mexFunction -L$MATLAB_ROOT\extern\lib\win64\microsoft\ -Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib -Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib  -NOLOGO -INCREMENTAL:NO -manifest" 
-               MEXLINK="-no-undefined /link /DLL -export:mexFunction" 
+                                        MEXLIB="-Wl,./../../c/libISSMCore.a -Wl,libISSMApi.a -Wl,libISSMMatlab.a -Wl,./../../c/libISSMModules.a -Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
+               MEXLINK="-no-undefined -Wl,/export:mexFunction" 
                                 fi
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
@@ -163 +163 @@
                 case "${host_os}" in
                                 *cygwin*)
-                                TRIANGLELIB=$TRIANGLE_ROOT/triangle.lib
+                                TRIANGLELIB="-Wl,`cygpath -m $TRIANGLE_ROOT/`triangle.lib"
                                 ;;
                                 *linux*)
@@ -616 +616 @@
                         *cygwin*)
                         if test $PETSC_MAJOR -lt 3 ; then
-                                PETSCLIB=-Wl,/LIBPATH:`cygpath -w $PETSC_ROOT/lib` libpetscksp.lib libpetscdm.lib libpetscmat.lib libpetscvec.lib libpetscsnes.lib libpetscts.lib libmpiuni.lib libpetsc.lib
+                                PETSCLIB=-Wl,/LIBPATH:`cygpath -w $PETSC_ROOT/lib`  -Wl,libpetscksp.lib  -Wl,libpetscdm.lib  -Wl,libpetscmat.lib  -Wl,libpetscvec.lib  -Wl,libpetscsnes.lib  -Wl,libpetscts.lib  -Wl,libmpiuni.lib  -Wl,libpetsc.lib
                         else
-                                PETSCLIB="-L$PETSC_ROOT/lib libpetsc.lib"
-                                if test $PETSC_MAJOR -gt 3 || test $PETSC_MINOR -ge 3; then PETSCLIB+=" libmetis.lib"; fi
+                                PETSCLIB="-L$PETSC_ROOT/lib  -Wl,libpetsc.lib"
+                                if test $PETSC_MAJOR -gt 3 || test $PETSC_MINOR -ge 3; then PETSCLIB+="  -Wl,libmetis.lib"; fi
                         fi
                         ;;
@@ -681 +681 @@
                                 case "${host_os}" in
                                         *cygwin*)
-                                        METISLIB="-L$METIS_ROOT libmetis.lib"
+                                        METISLIB="-L$METIS_ROOT -Wl,libmetis.lib"
                                         ;;
                                         *linux*)
@@ -822 +822 @@
                 case "${host_os}" in
                         *cygwin*)
-                        BLASLAPACKLIB="-L$BLASLAPACK_ROOT libf2cblas.lib  libf2clapack.lib"
+                        BLASLAPACKLIB="-L`cygpath -m $BLASLAPACK_ROOT` -Wl,libf2cblas.lib  -Wl,libf2clapack.lib"
                         ;;
                         *linux*)

issm/trunk-jpl/src/wrappers/matlab/Makefile.am

@@ -122 +122 @@
 deps += ../../c/libISSMModules.la ../../c/libISSMCore.la ./libISSMApi.la ./libISSMMatlab.a
 else
-deps += ${OS_LDFLAG}./libISSMMatlab.a ${OS_LDFLAG}../../c/libISSMModules.a ${OS_LDFLAG}../../c/libISSMCore.a ${OS_LDFLAG}./libISSMApi.a
+deps += ./libISSMMatlab.a ../../c/libISSMModules.a ../../c/libISSMCore.a ./libISSMApi.a
 if ADOLC
 deps += $(ADOLCLIB)
@@ -271 +271 @@
 Scotch_la_SOURCES = ../Scotch/Scotch.cpp\
                                                   ../Scotch/Scotch.h
-Scotch_la_LIBADD = ${deps} $(SCOTCHLIB) $(MPILIB)
+Scotch_la_LIBADD = ${deps} $(SCOTCHLIB) $(MPILIB) $(BLASLAPACKLIB)
 
 Shp2Exp_la_SOURCES = ../Shp2Exp/Shp2Exp.cpp\