[svn-r20141] Bring 1.8 r20139 cmake and windows changes to trunk

1 files changed, 2 insertions, 22 deletions

diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT
index 0d61260..2f75286 100755
--- a/windows/hdf5bt.BAT
+++ b/windows/hdf5bt.BAT
@@ -19,9 +19,8 @@ rem This batch file takes the following options:
 rem .  /vs9              Build HDF5 using Visual Studio 2008

 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 .                    in the environment, rather than the IDE.

 rem .  /ivf101           Build HDF5 Fortran using Intel Visual Fortran 10.1

-rem .  /ivf111           Build HDF5 Fortran using Intel Visual Fortran 11.1

 rem .  /log              Log the build and test results in files defined by

 rem .                      environment variables HDF5BUILD_LOG and

 rem .                      HDF5CHECK_LOG

@@ -60,7 +59,6 @@ rem Print a help message
     echo.   /vs9              Build HDF5 using Visual Studio 2008

     echo.   /fort             Build and test HDF5 with Fortran libraries

     echo.   /ivf101           Build HDF5 Fortran using Intel Visual Fortran 10.1

-    echo.   /ivf111           Build HDF5 Fortran using Intel Visual Fortran 9.1

     echo.   /useenv           Build HDF5 using compiler settings defined

     echo.                     in the environment, rather than the IDE.

     echo.   /?                Help information

@@ -72,12 +70,7 @@ rem Parse through the parameters sent to file, and set appropriate variables
 :parse_params

 

     for %%a in (%*) do (

-        if "%%a"=="/vs8" (

-            rem Use Visual Studio 2005 to build

-            call :help

-            exit /b 1

-            

-        ) else if "%%a"=="/vs9" (

+        if "%%a"=="/vs9" (

             rem Use Visual Studio 2008 to build

             set hdf5_vs2008=true

             

@@ -85,19 +78,10 @@ rem Parse through the parameters sent to file, and set appropriate variables
             rem Enable Fortran

             set hdf5_enablefortran=true

             

-        ) else if "%%a"=="/ivf91" (

-            rem Enable Fortran

-            call :help

-            exit /b 1

-            

         ) else if "%%a"=="/ivf101" (

             rem Enable Fortran

             set hdf5_ivf101=true

             

-        ) else if "%%a"=="/ivf111" (

-            rem Enable Fortran

-            set hdf5_ivf111=true

-            

         ) else if "%%a"=="/useenv" (

             rem Pass /useenv flag to devenv

             set hdf5_useenv=true

@@ -139,10 +123,6 @@ rem Setup our environment
         set hdf5check_params=enableall

     )

     

-    if defined hdf5_ivf111 (

-        set hdf5build_params=%hdf5build_params% /ivf111

-    )

-    

     if defined hdf5_ivf101 (

         set hdf5build_params=%hdf5build_params% /ivf101

     )