summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Wegner <swegner@hdfgroup.org>2007-03-22 19:45:33 (GMT)
committerScott Wegner <swegner@hdfgroup.org>2007-03-22 19:45:33 (GMT)
commit00f32db756d2f11f9fddb8edc67850944aa5ee1d (patch)
treefdcd60ac5606bf1b255d466c023b40738664695b
parenteeaf1d185eb2ace64aaccbb17bf6d0dc33e97bf2 (diff)
downloadhdf5-00f32db756d2f11f9fddb8edc67850944aa5ee1d.zip
hdf5-00f32db756d2f11f9fddb8edc67850944aa5ee1d.tar.gz
hdf5-00f32db756d2f11f9fddb8edc67850944aa5ee1d.tar.bz2
[svn-r13536] Added source files to Windows C++ test project files. Both testhdf5_cpp.dsp and testhdf5_cppdll.dsp received:
./c++/test/tcompound.cpp ./c++/test/ttypes.cpp ./c++/test/tfilter.cpp ./c++/test/tvlstr.cpp Also, fixed a declaration in ttypes.cpp that was causing a compile error in MSVS6.0. Tested: Visual Studio 6.0 on WinXP kagiso too minor for h5committest
-rw-r--r--c++/test/ttypes.cpp2
-rwxr-xr-xwindows/c++/test/testhdf5_cpp/testhdf5_cpp.dsp19
-rwxr-xr-xwindows/c++/test/testhdf5_cppdll/testhdf5_cppdll.dsp19
-rwxr-xr-xwindows/proj/all/all.dsw30
4 files changed, 67 insertions, 3 deletions
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index bdebcf7..ac468c4 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -307,7 +307,7 @@ static void test_query()
*
*-------------------------------------------------------------------------
*/
-const char* filename1("dtypes1.h5");
+const char* filename1 = "dtypes1.h5";
static void test_transient ()
{
static hsize_t ds_size[2] = {10, 20};
diff --git a/windows/c++/test/testhdf5_cpp/testhdf5_cpp.dsp b/windows/c++/test/testhdf5_cpp/testhdf5_cpp.dsp
index a513d04..fd1a449 100755
--- a/windows/c++/test/testhdf5_cpp/testhdf5_cpp.dsp
+++ b/windows/c++/test/testhdf5_cpp/testhdf5_cpp.dsp
@@ -26,7 +26,6 @@ CFG=testhdf5_cpp - Win32 Debug
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
-F90=df.exe
RSC=rc.exe
!IF "$(CFG)" == "testhdf5_cpp - Win32 Release"
@@ -42,6 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "../../../../c++/test/testhdf5_cpp/Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
+F90=df.exe
# ADD BASE F90 /include:"Release/"
# ADD F90 /include:"Release/"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
@@ -68,6 +68,7 @@ LINK32=link.exe
# PROP Intermediate_Dir "../../../../c++/test/testhdf5_cpp/Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
+F90=df.exe
# ADD BASE F90 /include:"Debug/"
# ADD F90 /include:"Debug/"
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
@@ -100,6 +101,10 @@ SOURCE="..\..\..\..\c++\test\tattr.cpp"
# End Source File
# Begin Source File
+SOURCE="..\..\..\..\c++\test\tcompound.cpp"
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\test\testframe.c
# End Source File
# Begin Source File
@@ -112,12 +117,24 @@ SOURCE="..\..\..\..\c++\test\tfile.cpp"
# End Source File
# Begin Source File
+SOURCE="..\..\..\..\c++\test\tfilter.cpp"
+# End Source File
+# Begin Source File
+
SOURCE="..\..\..\..\c++\test\th5s.cpp"
# End Source File
# Begin Source File
SOURCE="..\..\..\..\c++\test\trefer.cpp"
# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\..\c++\test\ttypes.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\..\c++\test\tvlstr.cpp"
+# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.dsp b/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.dsp
index 6295e81..e7326b8 100755
--- a/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.dsp
+++ b/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.dsp
@@ -26,7 +26,6 @@ CFG=testhdf5_cppdll - Win32 Debug
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
-F90=df.exe
RSC=rc.exe
!IF "$(CFG)" == "testhdf5_cppdll - Win32 Release"
@@ -42,6 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "../../../../c++/test/testhdf5_cppdll/Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
+F90=df.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\c++\src" /D "HDF5CPP_USEDLL" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -66,6 +66,7 @@ LINK32=link.exe
# PROP Intermediate_Dir "../../../../c++/test/testhdf5_cppdll/Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
+F90=df.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\test" /I "..\..\..\..\c++\src" /D "HDF5CPP_USEDLL" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,6 +97,10 @@ SOURCE="..\..\..\..\c++\test\tattr.cpp"
# End Source File
# Begin Source File
+SOURCE="..\..\..\..\c++\test\tcompound.cpp"
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\test\testframe.c
# End Source File
# Begin Source File
@@ -108,12 +113,24 @@ SOURCE="..\..\..\..\c++\test\tfile.cpp"
# End Source File
# Begin Source File
+SOURCE="..\..\..\..\c++\test\tfilter.cpp"
+# End Source File
+# Begin Source File
+
SOURCE="..\..\..\..\c++\test\th5s.cpp"
# End Source File
# Begin Source File
SOURCE="..\..\..\..\c++\test\trefer.cpp"
# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\..\c++\test\ttypes.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\..\c++\test\tvlstr.cpp"
+# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/windows/proj/all/all.dsw b/windows/proj/all/all.dsw
index 10d899f..61a8d05 100755
--- a/windows/proj/all/all.dsw
+++ b/windows/proj/all/all.dsw
@@ -434,6 +434,36 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name h5mkgrp
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name dsets_cpp
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name dsets_cppdll
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name hdf5_cpp
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name hdf5_cppdll
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name hdf5_hl_cpp
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name hdf5_hl_cppdll
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name hl_test_table_cpp
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name hl_test_table_cppdll
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name testhdf5_cpp
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name testhdf5_cppdll
+ End Project Dependency
}}}
###############################################################################