Changeset 11536

Timestamp:

02/24/12 15:42:25 (13 years ago)

Author:

Eric.Larour

Message:

New configuration files, more flexible

Location:

issm/trunk-jpl/configs

Files:

• config-win7-32.sh (modified) (1 diff)
• config-win7-64.sh (modified) (1 diff)

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

@@ -1 +1 @@
 #!/bin/sh
 
+#Dos style path needed for the windows sdk 7.1 cl compiler: 
+ISSM_TIER_WIN=`cygpath -m "$ISSM_TIER"`
 
 #get configure.sh to pick up the win7 Visual Studio compiler 
-./configure --prefix=$ISSM_TIER --with-vendor=intel-win7-32  --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_TIER_WIN/externalpackages/triangle/install --with-metis-dir=$ISSM_TIER_WIN/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER_WIN/externalpackages/petsc/install  --with-petsc-arch=$ISSM_ARCH  --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib/  --with-mpi-lib=$ISSM_TIER_WIN/externalpackages/petsc/install/lib/libpetsc.lib --with-mpi-include=$ISSM_TIER_WIN/externalpackages/petsc/install/include/mpiuni
+./configure --prefix=$ISSM_TIER \
+        --with-vendor=intel-win7-32  \
+        --with-matlab-dir=$MATLAB_DIR \
+        --with-triangle-dir="$ISSM_TIER_WIN/externalpackages/triangle/install" \
+        --with-metis-dir="$ISSM_TIER_WIN/externalpackages/metis/install" \
+        --with-petsc-dir="$ISSM_TIER_WIN/externalpackages/petsc/install" \
+        --with-petsc-arch=$ISSM_ARCH  \
+        --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib/  \
+        --with-mpi-lib="$ISSM_TIER_WIN/externalpackages/petsc/install/lib/libpetsc.lib" \
+        --with-mpi-include="$ISSM_TIER_WIN/externalpackages/petsc/install/include/mpiuni" 

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

@@ -1 +1 @@
 #!/bin/sh
 
+#Dos style path needed for the windows sdk 7.1 cl compiler: 
+ISSM_TIER_WIN=`cygpath -m "$ISSM_TIER"`
 
 #get configure.sh to pick up the win7 Visual Studio compiler 
-./configure --prefix=$ISSM_TIER --with-vendor=intel-win7-64  --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_TIER_WIN/externalpackages/triangle/install --with-metis-dir=$ISSM_TIER_WIN/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER_WIN/externalpackages/petsc/install  --with-petsc-arch=$ISSM_ARCH  --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib/  --with-mpi-lib=$ISSM_TIER_WIN/externalpackages/petsc/install/lib/libpetsc.lib --with-mpi-include=$ISSM_TIER_WIN/externalpackages/petsc/install/include/mpiuni
+./configure --prefix=$ISSM_TIER \
+        --with-vendor=intel-win7-64  \
+        --with-matlab-dir=$MATLAB_DIR \
+        --with-triangle-dir="$ISSM_TIER_WIN/externalpackages/triangle/install" \
+        --with-metis-dir="$ISSM_TIER_WIN/externalpackages/metis/install" \
+        --with-petsc-dir="$ISSM_TIER_WIN/externalpackages/petsc/install" \
+        --with-petsc-arch=$ISSM_ARCH  \
+        --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib/  \
+        --with-mpi-lib="$ISSM_TIER_WIN/externalpackages/petsc/install/lib/libpetsc.lib" \
+        --with-mpi-include="$ISSM_TIER_WIN/externalpackages/petsc/install/include/mpiuni"