diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2008-04-30 19:51:13 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2008-04-30 19:51:13 (GMT) |
| commit | aec106e324ce20e5efb725c25a6a333c7970127b (patch) | |
| tree | 234df369115a46b08037c5f385061cf58823e497 /windows/tools/h5stat | |
| parent | 5773fd34bc5adf59b4530d95ac9f0c0585902803 (diff) | |
| download | hdf5-aec106e324ce20e5efb725c25a6a333c7970127b.zip hdf5-aec106e324ce20e5efb725c25a6a333c7970127b.tar.gz hdf5-aec106e324ce20e5efb725c25a6a333c7970127b.tar.bz2 | |
[svn-r14903] Undoing change committed in r14902.
Diffstat (limited to 'windows/tools/h5stat')
| -rw-r--r-- | windows/tools/h5stat/h5stat.vcproj | 17 | ||||
| -rw-r--r-- | windows/tools/h5stat/testh5stat.bat | 4 |
2 files changed, 11 insertions, 10 deletions
diff --git a/windows/tools/h5stat/h5stat.vcproj b/windows/tools/h5stat/h5stat.vcproj index ac5f56b..6f5c191 100644 --- a/windows/tools/h5stat/h5stat.vcproj +++ b/windows/tools/h5stat/h5stat.vcproj @@ -4,6 +4,7 @@ Version="8.00"
Name="h5stat"
ProjectGUID="{405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5}"
+ RootNamespace="h5stat"
>
<Platforms>
<Platform
@@ -21,7 +22,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -75,7 +76,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5stat/Debug/h5stat.pdb"
@@ -112,7 +113,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -167,7 +168,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5stat/Debug/h5stat.pdb"
@@ -204,7 +205,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -259,7 +260,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5stat/Release/h5stat.pdb"
SubSystem="1"
@@ -295,7 +296,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -351,7 +352,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5stat/Release/h5stat.pdb"
SubSystem="1"
diff --git a/windows/tools/h5stat/testh5stat.bat b/windows/tools/h5stat/testh5stat.bat index 3bc6ab0..06ab4ba 100644 --- a/windows/tools/h5stat/testh5stat.bat +++ b/windows/tools/h5stat/testh5stat.bat @@ -99,7 +99,7 @@ rem call :testing CREATED %stat% %params%
copy /y %actual% %expect%
) else (
- fc /w %expect% %actual% | find "FC: no diff" > nul
+ fc /w %expect% %actual% > nul
if !errorlevel! equ 0 (
call :testing PASSED %stat% %params%
) else (
@@ -173,4 +173,4 @@ rem ############################################################################ popd
endlocal & exit /b %nerrors%
-
\ No newline at end of file +
|