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

1 files changed, 36 insertions, 65 deletions

diff --git a/windows/hdf5build_examples.BAT b/windows/hdf5build_examples.BAT
index 3fea330..aa198b3 100644
--- a/windows/hdf5build_examples.BAT
+++ b/windows/hdf5build_examples.BAT
@@ -17,8 +17,8 @@ rem File Name: hdf5build_examples.bat
 rem This batch file is used to build HDF5 C/C++/Fortran examples.

 rem This batch file takes the following options:

 rem .  /fort             Build HDF5 examples, including Fortran

-rem .  /nodebug          Note: Default is to build debug and release versions

 rem .  /useenv           Build HDF5 examples using compiler settings defined

+rem .  /nodebug          Note: Default is to build debug and release versions

 rem .                    in the environment, rather than the IDE.

 rem .  /?                Help information

 rem By Scott Wegner

@@ -43,7 +43,7 @@ pushd %~dp0
 

 set nerrors=0

 if "%1"=="/?" goto help

-set blddebug=debug

+set blddebug=

 set bldrelease=release

 goto main

 

@@ -55,9 +55,7 @@ rem Print a help message
     echo.Usage: %~nx0 [OPTION]

     echo.

     echo.   /fort             Build HDF5 examples, including Fortran

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

-    echo.   /ivf111           Build HDF5 examples using Intel Visual Fortran 11.1

-    echo.   /nodebug          Note: Default is to build debug and release versions

+    echo.   /debug            Note: Default is to build release only versions

     echo.   /useenv           Build HDF5 examples using compiler settings defined

     echo.                     in the environment, rather than the IDE.

     echo.   /?                Help information

@@ -73,17 +71,9 @@ rem Parse through the parameters sent to file, and set appropriate variables
             rem Enable Fortran

             set hdf5_enablefortran=true

             

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

-            rem Enable Fortran

-            set hdf5_ivf111=true

-            

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

-            rem Enable Fortran

-            set hdf5_ivf101=true

-

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

+        ) else if "%%a"=="/debug" (

             rem Enable Fortran

-            set blddebug=

+            set blddebug=debug

             

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

             rem Pass /useenv flag to devenv

@@ -106,7 +96,10 @@ rem Setup our environment
     rem Constants

     

     echo.Setting up environment

-     

+    

+    rem Setup Visual Studio environment.  By default, use the Visual Studio 

+    rem 2008 environment.

+    

     rem Make sure PROCESSOR_ARCHITECURE is set to either x86 or AMD64

     if "%PROCESSOR_ARCHITECTURE%"=="x86" (

         set hdf5_platform=Win32

@@ -117,66 +110,44 @@ rem Setup our environment
         echo.either x86 or AMD64

         exit /b 1

     )

-   

-    rem Setup Visual Studio environment.  By default, use the Visual Studio 

-    rem 2008 environment.

     

     set ccflags=

     

-    rem Currently VS2008 is the only compiler supported. 8

+    rem Currently VS2008 is the only compiler supported.

     echo.Using Visual Studio 2008

     

     if not defined hdf5_enablefortran (

-		if defined vs90comntools (

-			rem This sets the Visual Studio 2008 path and environment variables

-			if %hdf5_platform%==Win32 (

-				call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86

-			) else (

-				call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86_amd64

-			)

-       ) else (

-            echo.Error: Cannot setup Visual Studio 2009 environment.  Please

+        if defined vs90comntools (

+            rem This sets the Visual Studio 2008 path and environment variables

+            if %hdf5_platform%==Win32 (

+                call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86

+            ) else (

+                call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86_amd64

+            )

+

+        ) else (

+            echo.Error: Cannot setup Visual Studio 2008 environment.  Please

             echo.make sure VS90COMNTOOLS is defined in the environment.

             exit /b 1

         )

         

     ) else (

-		if not defined hdf5_ivf101 (

-			echo.with Intel Visual Fortran 11.1

-			

-			if defined ifort_compiler111 (

-				rem This sets the Intel Fortran 11.1 environment, as well as

-				rem setting the appropriate Visual Studio environment

-				

-				if %hdf5_platform%==Win32 (

-					call "%ifort_compiler111%\Bin\IA32\ifortvars_ia32.bat"

-				) else (

-					call "%ifort_compiler111%\Bin\intel64\ifortvars_intel64.bat"

-				)

-			) else (

-				echo.Error: Cannot setup Intel Fortran 11.1 environment.  Please

-				echo.make sure IFORT_COMPILER111 is defined in the environment.

-				exit /b 1

-			)

-			

-		) else (

-			echo.with Intel Visual Fortran 10.1

-		

-			if defined ifort_compiler10 (

-				rem This sets the Intel Fortran 10.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

-			)

-		)

+        echo.with Intel Visual Fortran 10.1

+        

+        if defined ifort_compiler10 (

+            rem This sets the Intel Fortran 10.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

+        )

     )

     

     rem Setup variables for our SLN files