summaryrefslogtreecommitdiffstats
path: root/windows
diff options
context:
space:
mode:
authorScott Wegner <swegner@hdfgroup.org>2008-06-30 19:19:11 (GMT)
committerScott Wegner <swegner@hdfgroup.org>2008-06-30 19:19:11 (GMT)
commit0c0e746ce72e71fb34608a256e8e1130a9060e4c (patch)
treeadd794b6b8994b80dc128032ec5a44eae19af1ba /windows
parent2b1ee377c33c1f6cedb4e3eeda9fcf4634acabb8 (diff)
downloadhdf5-0c0e746ce72e71fb34608a256e8e1130a9060e4c.zip
hdf5-0c0e746ce72e71fb34608a256e8e1130a9060e4c.tar.gz
hdf5-0c0e746ce72e71fb34608a256e8e1130a9060e4c.tar.bz2
[svn-r15302] Purpose: Support Intel Visual Fortran 10.1 from Visual Studio and Windows command line
Description: Modify Windows documentation to support Intel Visual Fortran 10.1. We have tested it in our Virtual machines, and have fixed the problems we were encountering. Also, add a new parameter to the hdf5build.BAT and hdf5bt.BAT build scripts to support IVF 10.1.
Diffstat (limited to 'windows')
-rwxr-xr-xwindows/hdf5bt.BAT14
-rwxr-xr-xwindows/hdf5build.BAT68
2 files changed, 62 insertions, 20 deletions
diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT
index 683b400..555d715 100755
--- a/windows/hdf5bt.BAT
+++ b/windows/hdf5bt.BAT
@@ -21,13 +21,15 @@ rem . Note: Default is Visual Studio 2005
rem . /fort Build and test HDF5 with Fortran libraries
rem . /useenv Build HDF5 using compiler settings defined
rem . in the environment, rather than the IDE.
+rem . /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
+rem . Note: Default is Intel Visual Fortran 9.1
rem . /log Log the build and test results in files defined by
rem . environment variables HDF5BUILD_LOG and
rem . HDF5CHECK_LOG
rem . /? Help information
rem By Xuan Bai
rem Created: Aug. 16, 2004
-rem Last Updated: Scott Wegner, 5/27/08
+rem Last Updated: Scott Wegner, 6/30/08
rem This batch file makes the following assumptions:
rem - The appropriate version of Visual Studio is installed and setup
@@ -62,6 +64,8 @@ rem Print a help message
echo. /vs7 Build HDF5 using Visual Studio .NET 2003
echo. Note: Default is Visual Studio 2005
echo. /fort Build and test HDF5 with Fortran libraries
+ echo. /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
+ echo. Note: Default is Intel Visual Fortran 9.1
echo. /useenv Build HDF5 using compiler settings defined
echo. in the environment, rather than the IDE.
echo. /? Help information
@@ -81,6 +85,10 @@ rem Parse through the parameters sent to file, and set appropriate variables
rem Enable Fortran
set hdf5_enablefortran=true
+ ) else if "%%a"=="/ivf101" (
+ rem Enable Fortran
+ set hdf5_ivf101=true
+
) else if "%%a"=="/useenv" (
rem Pass /useenv flag to devenv
set hdf5_useenv=true
@@ -122,6 +130,10 @@ rem Setup our environment
set hdf5check_params=enableall
)
+ if defined hdf5_ivf101 (
+ set hdf5build_params=%hdf5build_params% /ivf101
+ )
+
if defined hdf5_useenv (
set hdf5build_params=%hdf5build_params% /useenv
)
diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT
index 9efddd6..3a6d641 100755
--- a/windows/hdf5build.BAT
+++ b/windows/hdf5build.BAT
@@ -18,13 +18,15 @@ rem This batch file is used to build HDF5 Libraries and Tools.
rem This batch file takes the following options:
rem . /vs7 Build HDF5 using Visual Studio .NET 2003
rem . Note: Default is Visual Studio 2005
-rem . /fort Build HDF5 with Fortran libraries
+rem . /fort Build HDF5 with Fortran libraries
+rem . /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
+rem . Note: Default is Intel Visual Fortran 9.1
rem . /useenv Build HDF5 using compiler settings defined
rem . in the environment, rather than the IDE.
rem . /? Help information
rem By Xuan Bai
rem Created: Aug. 16, 2004
-rem Last Updated: May 13, 2008
+rem Last Updated: Scott Wegner, 6/30/08
rem This batch file makes the following assumptions:
rem - The appropriate version of Visual Studio is installed and setup
@@ -54,12 +56,15 @@ rem Print a help message
echo.
echo.Usage: %~nx0 [OPTION]
echo.
- echo. /vs7 Build HDF5 using Visual Studio .NET 2003
- echo. Note: Default is Visual Studio 2005
- echo. /fort Build HDF5 with Fortran libraries
- echo. /useenv Build HDF5 using compiler settings defined
- echo. in the environment, rather than the IDE.
- echo. /? Help information
+ echo. /vs7 Build HDF5 using Visual Studio .NET 2003
+ echo. Note: Default is Visual Studio 2005
+ echo. /fort Build HDF5 with Fortran libraries using the
+ echo. Intel Fortran version specified, or 9.1 by default
+ echo. /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
+ echo. Note: Default is Intel Visual Fortran 9.1
+ echo. /useenv Build HDF5 using compiler settings defined
+ echo. in the environment, rather than the IDE.
+ echo. /? Help information
exit /b 0
@@ -71,10 +76,15 @@ rem Parse through the parameters sent to file, and set appropriate variables
if "%%a"=="/vs7" (
rem Use Visual Studio .NET 2003
set hdf5_vnet=true
+
) else if "%%a"=="/fort" (
rem Enable Fortran
set hdf5_enablefortran=true
+ ) else if "%%a"=="/ivf101" (
+ rem Enable Fortran
+ set hdf5_ivf101=true
+
) else if "%%a"=="/useenv" (
rem Pass /useenv flag to devenv
set hdf5_useenv=true
@@ -172,21 +182,41 @@ rem Setup our environment
)
) else (
- echo.with Intel Visual Fortran 9.1
-
- if defined ifort_compiler91 (
- rem This sets the Intel Fortran 9.1 environment, as well as
- rem setting the appropriate Visual Studio environment
+ if not defined hdf5_ivf101 (
+ echo.with Intel Visual Fortran 9.1
- if %hdf5_platform%==Win32 (
- call "%ifort_compiler91%\IA32\Bin\ifortvars.bat"
+ if defined ifort_compiler91 (
+ rem This sets the Intel Fortran 9.1 environment, as well as
+ rem setting the appropriate Visual Studio environment
+
+ if %hdf5_platform%==Win32 (
+ call "%ifort_compiler91%\IA32\Bin\ifortvars.bat"
+ ) else (
+ call "%ifort_compiler91%\em64t\Bin\ifortvars.bat"
+ )
) else (
- call "%ifort_compiler91%\em64t\Bin\ifortvars.bat"
+ echo.Error: Cannot setup Intel Fortran 9.1 environment. Please
+ echo.make sure IFORT_COMPILER91 is defined in the environment.
+ exit /b 1
)
+
) else (
- echo.Error: Cannot setup Intel Fortran 9.1 environment. Please
- echo.make sure IFORT_COMPILER91 is defined in the environment.
- exit /b 1
+ echo.with Intel Visual Fortran 10.1
+
+ if defined ifort_compiler10 (
+ rem This sets the Intel Fortran 9.1 environment, as well as
+ rem setting the appropriate Visual Studio environment
+
+ if %hdf5_platform%==Win32 (
+ call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
+ ) else (
+ call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
+ )
+ ) else (
+ echo.Error: Cannot setup Intel Fortran 10.1 environment. Please
+ echo.make sure IFORT_COMPILER10 is defined in the environment.
+ exit /b 1
+ )
)
)
)