diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2008-04-30 19:23:26 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2008-04-30 19:23:26 (GMT) |
| commit | 5773fd34bc5adf59b4530d95ac9f0c0585902803 (patch) | |
| tree | 456ad239799382e1f083fb7fc74399e43b471912 /windows/tools/h5ls | |
| parent | 0138995d1ce2068db1f790503435a2121132d3ad (diff) | |
| download | hdf5-5773fd34bc5adf59b4530d95ac9f0c0585902803.zip hdf5-5773fd34bc5adf59b4530d95ac9f0c0585902803.tar.gz hdf5-5773fd34bc5adf59b4530d95ac9f0c0585902803.tar.bz2 | |
[svn-r14902] Merged fortran_1_8 branch changes r14505:14901 into the trunk. New fortran wrappers added.
Diffstat (limited to 'windows/tools/h5ls')
| -rw-r--r-- | windows/tools/h5ls/h5ls.vcproj | 17 | ||||
| -rw-r--r-- | windows/tools/h5ls/testh5ls.bat | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/windows/tools/h5ls/h5ls.vcproj b/windows/tools/h5ls/h5ls.vcproj index 80b03fb..ae96caa 100644 --- a/windows/tools/h5ls/h5ls.vcproj +++ b/windows/tools/h5ls/h5ls.vcproj @@ -4,7 +4,6 @@ Version="8.00"
Name="h5ls"
ProjectGUID="{357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0}"
- RootNamespace="h5ls"
>
<Platforms>
<Platform
@@ -22,7 +21,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -77,7 +76,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="0"
+ LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libcd.lib"
ProgramDatabaseFile=".\../../../tools/h5ls/Release/h5ls.pdb"
@@ -114,7 +113,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -170,7 +169,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="0"
+ LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libcd.lib"
ProgramDatabaseFile=".\../../../tools/h5ls/Release/h5ls.pdb"
@@ -207,7 +206,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -260,7 +259,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="0"
+ LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="true"
@@ -298,7 +297,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -352,7 +351,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="0"
+ LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="true"
diff --git a/windows/tools/h5ls/testh5ls.bat b/windows/tools/h5ls/testh5ls.bat index 3baeda8..0329447 100644 --- a/windows/tools/h5ls/testh5ls.bat +++ b/windows/tools/h5ls/testh5ls.bat @@ -124,7 +124,7 @@ rem %2 and on -- argument for the h5ls tool rem call :testing CREATED %params%
rem copy %actual% %expect% > nul
) else (
- fc /w %expect% %actual% > nul
+ fc /w %expect% %actual% | find "FC: no diff" > nul
if !errorlevel! equ 0 (
call :testing PASSED %params%
) else (
|