Changeset 19390 for issm/trunk-jpl/m4/issm_options.m4

Timestamp:

06/04/15 19:23:22 (10 years ago)

Author:

glperez

Message:

CHG: Added MPI variables to sdk 7.1 Win64 environment script.
CHG: New option for parallel Win64
CHG: Added contional to set number of processes to 1 when Windows build is not parallel.
CHG: Added ability to for IssmConfig to recognize when Petsc provides MPI.

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -204 +204 @@
                         IS_WINDOWS=yes
                         OSLIBS="-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"
+                elif  test $VENDOR = MSVC-Win64-par; then
+                        export CC=cl
+                        export CXX=cccl
+                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export AR="ar-lib lib"
+                        export OS_LDFLAG="-Wl,"
+                        export RANLIB=true
+                        IS_WINDOWS=yes
+                        OSLIBS="-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"
                 elif test $VENDOR = intel-linux; then
                         export CC=icc