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/h5diff | |
| 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/h5diff')
| -rw-r--r-- | windows/tools/h5diff/h5diff.vcproj | 17 | ||||
| -rw-r--r-- | windows/tools/h5diff/testh5diff.bat | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/windows/tools/h5diff/h5diff.vcproj b/windows/tools/h5diff/h5diff.vcproj index b5ad479..fe9c65e 100644 --- a/windows/tools/h5diff/h5diff.vcproj +++ b/windows/tools/h5diff/h5diff.vcproj @@ -4,7 +4,6 @@ Version="8.00"
Name="h5diff"
ProjectGUID="{1C5A9EC8-F882-4A8A-B773-E79CD46369AF}"
- RootNamespace="h5diff"
>
<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="libc.lib"
GenerateDebugInformation="true"
@@ -115,7 +114,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"
@@ -171,7 +170,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"
@@ -209,7 +208,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"
@@ -264,7 +263,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/h5diff/Release/h5diff.pdb"
@@ -301,7 +300,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"
@@ -357,7 +356,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/h5diff/Release/h5diff.pdb"
diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat index d3c407a..fba7ef0 100644 --- a/windows/tools/h5diff/testh5diff.bat +++ b/windows/tools/h5diff/testh5diff.bat @@ -141,7 +141,7 @@ rem call :testing CREATED %h5diff% %params%
copy /y %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 %h5diff% %params%
) else (
|