Make CppUnit a component of Poco

Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
This commit is contained in:
FrancisANDRE
2016-01-08 00:17:13 +01:00
parent d03ac30383
commit ce797f7700
717 changed files with 1872 additions and 1843 deletions

View File

@@ -14,4 +14,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF
add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_executable( ${TESTUNIT} ${TEST_SRCS} )
add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all)
target_link_libraries( ${TESTUNIT} PocoCppParser PocoFoundation CppUnit ) target_link_libraries( ${TESTUNIT} PocoCppParser PocoFoundation PocoCppUnit )

View File

@@ -14,6 +14,6 @@ objects = CppParserTestSuite Driver \
target = testrunner target = testrunner
target_version = 1 target_version = 1
target_libs = PocoCppParser PocoFoundation CppUnit target_libs = PocoCppParser PocoFoundation PocoCppUnit
include $(POCO_BASE)/build/rules/exec include $(POCO_BASE)/build/rules/exec

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuited.exe</OutputFile> <OutputFile>bin\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuite.exe</OutputFile> <OutputFile>bin\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuited.exe</OutputFile> <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuite.exe</OutputFile> <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuited.exe</OutputFile> <OutputFile>bin64\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuite.exe</OutputFile> <OutputFile>bin64\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuited.exe</OutputFile> <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuite.exe</OutputFile> <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -11,8 +11,8 @@
#include "AttributesParserTest.h" #include "AttributesParserTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/CppParser/Attributes.h" #include "Poco/CppParser/Attributes.h"
#include "Poco/CppParser/AttributesParser.h" #include "Poco/CppParser/AttributesParser.h"
#include <sstream> #include <sstream>

View File

@@ -17,7 +17,7 @@
#include "Poco/CppParser/CppParser.h" #include "Poco/CppParser/CppParser.h"
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
class AttributesParserTest: public CppUnit::TestCase class AttributesParserTest: public CppUnit::TestCase

View File

@@ -16,7 +16,7 @@
#define AttributesTestSuite_INCLUDED #define AttributesTestSuite_INCLUDED
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
class AttributesTestSuite class AttributesTestSuite

View File

@@ -11,8 +11,8 @@
#include "CppParserTest.h" #include "CppParserTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/CppParser/Utility.h" #include "Poco/CppParser/Utility.h"
#include "Poco/CppParser/Symbol.h" #include "Poco/CppParser/Symbol.h"
#include <iostream> #include <iostream>

View File

@@ -17,7 +17,7 @@
#include "Poco/CppParser/CppParser.h" #include "Poco/CppParser/CppParser.h"
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
class CppParserTest: public CppUnit::TestCase class CppParserTest: public CppUnit::TestCase

View File

@@ -16,7 +16,7 @@
#define CppParserTestSuite_INCLUDED #define CppParserTestSuite_INCLUDED
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
class CppParserTestSuite class CppParserTestSuite

View File

@@ -12,7 +12,7 @@
// //
#include "CppUnit/TestRunner.h" #include "Poco/CppUnit/TestRunner.h"
#include "CppParserTestSuite.h" #include "CppParserTestSuite.h"

View File

@@ -626,67 +626,67 @@
Filter="*.h" Filter="*.h"
> >
<File <File
RelativePath=".\include\CppUnit\CppUnit.h" RelativePath=".\include\Poco\CppUnit\$(TargetName).h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\CppUnitException.h" RelativePath=".\include\Poco\CppUnit\CppUnitException.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\estring.h" RelativePath=".\include\Poco\CppUnit\estring.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\Guards.h" RelativePath=".\include\Poco\CppUnit\Guards.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\Orthodox.h" RelativePath=".\include\Poco\CppUnit\Orthodox.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\RepeatedTest.h" RelativePath=".\include\Poco\CppUnit\RepeatedTest.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\Test.h" RelativePath=".\include\Poco\CppUnit\Test.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestCaller.h" RelativePath=".\include\Poco\CppUnit\TestCaller.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestCase.h" RelativePath=".\include\Poco\CppUnit\TestCase.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestDecorator.h" RelativePath=".\include\Poco\CppUnit\TestDecorator.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestFailure.h" RelativePath=".\include\Poco\CppUnit\TestFailure.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestResult.h" RelativePath=".\include\Poco\CppUnit\TestResult.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestRunner.h" RelativePath=".\include\Poco\CppUnit\TestRunner.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestSetup.h" RelativePath=".\include\Poco\CppUnit\TestSetup.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestSuite.h" RelativePath=".\include\Poco\CppUnit\TestSuite.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TextTestResult.h" RelativePath=".\include\Poco\CppUnit\TextTestResult.h"
> >
</File> </File>
</Filter> </Filter>

View File

@@ -149,12 +149,12 @@
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<OutputFile>..\bin\$(Platform)\CppUnitd.dll</OutputFile> <OutputFile>..\bin\$(Platform)\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin\$(Platform)\CppUnitd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>..\bin\$(Platform)\$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>..\lib\$(Platform)\CppUnitd.lib</ImportLibrary> <ImportLibrary>..\lib\$(Platform)\$(TargetName).lib</ImportLibrary>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">
@@ -187,12 +187,12 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\bin\$(Platform)\CppUnit.dll</OutputFile> <OutputFile>..\bin\$(Platform)\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile> <ProgramDatabaseFile>
</ProgramDatabaseFile> </ProgramDatabaseFile>
<ImportLibrary>..\lib\$(Platform)\CppUnit.lib</ImportLibrary> <ImportLibrary>..\lib\$(Platform)\$(TargetName).lib</ImportLibrary>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">
@@ -214,7 +214,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\$(Platform)\CppUnitmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(Platform)\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
@@ -225,7 +225,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\$(Platform)\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib\$(Platform)\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">
@@ -258,7 +258,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\$(Platform)\CppUnitmd.lib</OutputFile> <OutputFile>..\lib\$(Platform)\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">
@@ -280,7 +280,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\$(Platform)\CppUnitmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(Platform)\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
@@ -291,7 +291,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\$(Platform)\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib\$(Platform)\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">
@@ -324,7 +324,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\$(Platform)\CppUnitmt.lib</OutputFile> <OutputFile>..\lib\$(Platform)\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@@ -338,22 +338,22 @@
<ClCompile Include="src\TextTestResult.cpp" /> <ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h" /> <ClInclude Include="include\Poco\CppUnit\$(TargetName).h" />
<ClInclude Include="include\CppUnit\CppUnitException.h" /> <ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\CppUnit\estring.h" /> <ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\CppUnit\Guards.h" /> <ClInclude Include="include\Poco\CppUnit\Guards.h" />
<ClInclude Include="include\CppUnit\Orthodox.h" /> <ClInclude Include="include\Poco\CppUnit\Orthodox.h" />
<ClInclude Include="include\CppUnit\RepeatedTest.h" /> <ClInclude Include="include\Poco\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\CppUnit\Test.h" /> <ClInclude Include="include\Poco\CppUnit\Test.h" />
<ClInclude Include="include\CppUnit\TestCaller.h" /> <ClInclude Include="include\Poco\CppUnit\TestCaller.h" />
<ClInclude Include="include\CppUnit\TestCase.h" /> <ClInclude Include="include\Poco\CppUnit\TestCase.h" />
<ClInclude Include="include\CppUnit\TestDecorator.h" /> <ClInclude Include="include\Poco\CppUnit\TestDecorator.h" />
<ClInclude Include="include\CppUnit\TestFailure.h" /> <ClInclude Include="include\Poco\CppUnit\TestFailure.h" />
<ClInclude Include="include\CppUnit\TestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TestResult.h" />
<ClInclude Include="include\CppUnit\TestRunner.h" /> <ClInclude Include="include\Poco\CppUnit\TestRunner.h" />
<ClInclude Include="include\CppUnit\TestSetup.h" /> <ClInclude Include="include\Poco\CppUnit\TestSetup.h" />
<ClInclude Include="include\CppUnit\TestSuite.h" /> <ClInclude Include="include\Poco\CppUnit\TestSuite.h" />
<ClInclude Include="include\CppUnit\TextTestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TextTestResult.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View File

@@ -111,12 +111,12 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">obj\$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">obj\$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">..\lib\$(Platform)\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">..\lib\$(Platform)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">obj\$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">obj\$(Platform)\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">CppUnitd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">$(ProjectName)d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">CppUnit</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">CppUnitmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">$(ProjectName)mdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">CppUnitmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">$(ProjectName)mtd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">CppUnitmd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">$(ProjectName)md</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">CppUnitmt</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">$(ProjectName)mt</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">
<ClCompile> <ClCompile>
@@ -149,12 +149,12 @@
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<OutputFile>..\bin\$(Platform)\CppUnitd.dll</OutputFile> <OutputFile>..\bin\$(Platform)\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin\$(Platform)\CppUnitd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>..\bin\$(Platform)\$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>..\lib\$(Platform)\CppUnitd.lib</ImportLibrary> <ImportLibrary>..\lib\$(Platform)\$(TargetName).lib</ImportLibrary>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">
@@ -187,12 +187,12 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\bin\$(Platform)\CppUnit.dll</OutputFile> <OutputFile>..\bin\$(Platform)\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile> <ProgramDatabaseFile>
</ProgramDatabaseFile> </ProgramDatabaseFile>
<ImportLibrary>..\lib\$(Platform)\CppUnit.lib</ImportLibrary> <ImportLibrary>..\lib\$(Platform)\$(TargetName).lib</ImportLibrary>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">
@@ -214,7 +214,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\$(Platform)\CppUnitmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(Platform)\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
@@ -225,7 +225,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\$(Platform)\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib\$(Platform)\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">
@@ -258,7 +258,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\$(Platform)\CppUnitmd.lib</OutputFile> <OutputFile>..\lib\$(Platform)\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">
@@ -280,7 +280,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\$(Platform)\CppUnitmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(Platform)\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
@@ -291,7 +291,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\$(Platform)\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib\$(Platform)\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">
@@ -324,7 +324,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\$(Platform)\CppUnitmt.lib</OutputFile> <OutputFile>..\lib\$(Platform)\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@@ -338,22 +338,22 @@
<ClCompile Include="src\TextTestResult.cpp" /> <ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h" /> <ClInclude Include="include\Poco\CppUnit\$(TargetName).h" />
<ClInclude Include="include\CppUnit\CppUnitException.h" /> <ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\CppUnit\estring.h" /> <ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\CppUnit\Guards.h" /> <ClInclude Include="include\Poco\CppUnit\Guards.h" />
<ClInclude Include="include\CppUnit\Orthodox.h" /> <ClInclude Include="include\Poco\CppUnit\Orthodox.h" />
<ClInclude Include="include\CppUnit\RepeatedTest.h" /> <ClInclude Include="include\Poco\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\CppUnit\Test.h" /> <ClInclude Include="include\Poco\CppUnit\Test.h" />
<ClInclude Include="include\CppUnit\TestCaller.h" /> <ClInclude Include="include\Poco\CppUnit\TestCaller.h" />
<ClInclude Include="include\CppUnit\TestCase.h" /> <ClInclude Include="include\Poco\CppUnit\TestCase.h" />
<ClInclude Include="include\CppUnit\TestDecorator.h" /> <ClInclude Include="include\Poco\CppUnit\TestDecorator.h" />
<ClInclude Include="include\CppUnit\TestFailure.h" /> <ClInclude Include="include\Poco\CppUnit\TestFailure.h" />
<ClInclude Include="include\CppUnit\TestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TestResult.h" />
<ClInclude Include="include\CppUnit\TestRunner.h" /> <ClInclude Include="include\Poco\CppUnit\TestRunner.h" />
<ClInclude Include="include\CppUnit\TestSetup.h" /> <ClInclude Include="include\Poco\CppUnit\TestSetup.h" />
<ClInclude Include="include\CppUnit\TestSuite.h" /> <ClInclude Include="include\Poco\CppUnit\TestSuite.h" />
<ClInclude Include="include\CppUnit\TextTestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TextTestResult.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View File

@@ -100,12 +100,12 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">CppUnitd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">$(ProjectName)d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">CppUnit</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">CppUnitmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">$(ProjectName)mdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">CppUnitmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">$(ProjectName)mtd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">CppUnitmd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">$(ProjectName)md</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">CppUnitmt</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">$(ProjectName)mt</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
<Midl> <Midl>
@@ -113,7 +113,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -122,7 +122,7 @@
<InlineFunctionExpansion>Default</InlineFunctionExpansion> <InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions> <IntrinsicFunctions>false</IntrinsicFunctions>
<AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -148,12 +148,12 @@
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<OutputFile>..\bin\CppUnitd.dll</OutputFile> <OutputFile>..\bin\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin\CppUnitd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>..\bin\$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>..\lib\CppUnitd.lib</ImportLibrary> <ImportLibrary>..\lib\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -163,7 +163,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -174,7 +174,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -196,12 +196,12 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\bin\CppUnit.dll</OutputFile> <OutputFile>..\bin\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile> <ProgramDatabaseFile>
</ProgramDatabaseFile> </ProgramDatabaseFile>
<ImportLibrary>..\lib\CppUnit.lib</ImportLibrary> <ImportLibrary>..\lib\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -211,7 +211,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -233,7 +233,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\CppUnitmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -245,7 +245,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -254,7 +254,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -287,7 +287,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
@@ -296,7 +296,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -318,7 +318,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\CppUnitmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -330,7 +330,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -339,7 +339,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -372,11 +372,11 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmt.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\CppUnitException.cpp" /> <ClCompile Include="src\$(ProjectName)Exception.cpp" />
<ClCompile Include="src\TestCase.cpp" /> <ClCompile Include="src\TestCase.cpp" />
<ClCompile Include="src\TestDecorator.cpp" /> <ClCompile Include="src\TestDecorator.cpp" />
<ClCompile Include="src\TestFailure.cpp" /> <ClCompile Include="src\TestFailure.cpp" />
@@ -386,22 +386,22 @@
<ClCompile Include="src\TextTestResult.cpp" /> <ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h" /> <ClInclude Include="include\Poco\CppUnit\$(TargetName).h" />
<ClInclude Include="include\CppUnit\CppUnitException.h" /> <ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\CppUnit\estring.h" /> <ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\CppUnit\Guards.h" /> <ClInclude Include="include\Poco\CppUnit\Guards.h" />
<ClInclude Include="include\CppUnit\Orthodox.h" /> <ClInclude Include="include\Poco\CppUnit\Orthodox.h" />
<ClInclude Include="include\CppUnit\RepeatedTest.h" /> <ClInclude Include="include\Poco\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\CppUnit\Test.h" /> <ClInclude Include="include\Poco\CppUnit\Test.h" />
<ClInclude Include="include\CppUnit\TestCaller.h" /> <ClInclude Include="include\Poco\CppUnit\TestCaller.h" />
<ClInclude Include="include\CppUnit\TestCase.h" /> <ClInclude Include="include\Poco\CppUnit\TestCase.h" />
<ClInclude Include="include\CppUnit\TestDecorator.h" /> <ClInclude Include="include\Poco\CppUnit\TestDecorator.h" />
<ClInclude Include="include\CppUnit\TestFailure.h" /> <ClInclude Include="include\Poco\CppUnit\TestFailure.h" />
<ClInclude Include="include\CppUnit\TestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TestResult.h" />
<ClInclude Include="include\CppUnit\TestRunner.h" /> <ClInclude Include="include\Poco\CppUnit\TestRunner.h" />
<ClInclude Include="include\CppUnit\TestSetup.h" /> <ClInclude Include="include\Poco\CppUnit\TestSetup.h" />
<ClInclude Include="include\CppUnit\TestSuite.h" /> <ClInclude Include="include\Poco\CppUnit\TestSuite.h" />
<ClInclude Include="include\CppUnit\TextTestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TextTestResult.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View File

@@ -106,12 +106,12 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">CppUnitd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">$(ProjectName)d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">CppUnit</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">CppUnitmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">$(ProjectName)mdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">CppUnitmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">$(ProjectName)mtd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">CppUnitmd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">$(ProjectName)md</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">CppUnitmt</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">$(ProjectName)mt</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
<Midl> <Midl>
@@ -119,7 +119,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -154,12 +154,12 @@
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<OutputFile>..\bin\CppUnitd.dll</OutputFile> <OutputFile>..\bin\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin\CppUnitd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>..\bin\$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>..\lib\CppUnitd.lib</ImportLibrary> <ImportLibrary>..\lib\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -169,7 +169,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -202,12 +202,12 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\bin\CppUnit.dll</OutputFile> <OutputFile>..\bin\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile> <ProgramDatabaseFile>
</ProgramDatabaseFile> </ProgramDatabaseFile>
<ImportLibrary>..\lib\CppUnit.lib</ImportLibrary> <ImportLibrary>..\lib\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -217,7 +217,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -239,7 +239,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\CppUnitmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -251,7 +251,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -260,7 +260,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -293,7 +293,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
@@ -302,7 +302,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -324,7 +324,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\CppUnitmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -336,7 +336,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -345,7 +345,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -378,7 +378,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmt.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@@ -392,22 +392,22 @@
<ClCompile Include="src\TextTestResult.cpp" /> <ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h" /> <ClInclude Include="include\Poco\CppUnit\$(TargetName).h" />
<ClInclude Include="include\CppUnit\CppUnitException.h" /> <ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\CppUnit\estring.h" /> <ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\CppUnit\Guards.h" /> <ClInclude Include="include\Poco\CppUnit\Guards.h" />
<ClInclude Include="include\CppUnit\Orthodox.h" /> <ClInclude Include="include\Poco\CppUnit\Orthodox.h" />
<ClInclude Include="include\CppUnit\RepeatedTest.h" /> <ClInclude Include="include\Poco\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\CppUnit\Test.h" /> <ClInclude Include="include\Poco\CppUnit\Test.h" />
<ClInclude Include="include\CppUnit\TestCaller.h" /> <ClInclude Include="include\Poco\CppUnit\TestCaller.h" />
<ClInclude Include="include\CppUnit\TestCase.h" /> <ClInclude Include="include\Poco\CppUnit\TestCase.h" />
<ClInclude Include="include\CppUnit\TestDecorator.h" /> <ClInclude Include="include\Poco\CppUnit\TestDecorator.h" />
<ClInclude Include="include\CppUnit\TestFailure.h" /> <ClInclude Include="include\Poco\CppUnit\TestFailure.h" />
<ClInclude Include="include\CppUnit\TestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TestResult.h" />
<ClInclude Include="include\CppUnit\TestRunner.h" /> <ClInclude Include="include\Poco\CppUnit\TestRunner.h" />
<ClInclude Include="include\CppUnit\TestSetup.h" /> <ClInclude Include="include\Poco\CppUnit\TestSetup.h" />
<ClInclude Include="include\CppUnit\TestSuite.h" /> <ClInclude Include="include\Poco\CppUnit\TestSuite.h" />
<ClInclude Include="include\CppUnit\TextTestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TextTestResult.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View File

@@ -106,12 +106,12 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">CppUnitd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">Poco$(ProjectName)d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">CppUnit</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">Poco$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">CppUnitmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">Poco$(ProjectName)mdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">CppUnitmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">Poco$(ProjectName)mtd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">CppUnitmd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">Poco$(ProjectName)md</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">CppUnitmt</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">Poco$(ProjectName)mt</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
<Midl> <Midl>
@@ -119,7 +119,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -128,7 +128,7 @@
<InlineFunctionExpansion>Default</InlineFunctionExpansion> <InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions> <IntrinsicFunctions>false</IntrinsicFunctions>
<AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Poco_CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -154,12 +154,12 @@
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<OutputFile>..\bin\CppUnitd.dll</OutputFile> <OutputFile>..\bin\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin\CppUnitd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>..\bin\$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>..\lib\CppUnitd.lib</ImportLibrary> <ImportLibrary>..\lib\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -169,7 +169,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -180,7 +180,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;Poco_CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -202,12 +202,12 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\bin\CppUnit.dll</OutputFile> <OutputFile>..\bin\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile> <ProgramDatabaseFile>
</ProgramDatabaseFile> </ProgramDatabaseFile>
<ImportLibrary>..\lib\CppUnit.lib</ImportLibrary> <ImportLibrary>..\lib\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -217,7 +217,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -239,7 +239,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\CppUnitmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -251,7 +251,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -260,7 +260,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -293,7 +293,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
@@ -302,7 +302,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -324,7 +324,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\CppUnitmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -336,7 +336,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -345,7 +345,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -378,7 +378,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmt.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@@ -392,7 +392,7 @@
<ClCompile Include="src\TextTestResult.cpp" /> <ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\Poco\CppUnit\CppUnit.h" /> <ClInclude Include="include\Poco\CppUnit\$(TargetName).h" />
<ClInclude Include="include\Poco\CppUnit\CppUnitException.h" /> <ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\Poco\CppUnit\estring.h" /> <ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\Poco\CppUnit\Guards.h" /> <ClInclude Include="include\Poco\CppUnit\Guards.h" />

View File

@@ -106,12 +106,12 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">CppUnitd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppUnitd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">CppUnit</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCppUnit</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">CppUnitmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppUnitmdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">CppUnitmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppUnitmtd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">CppUnitmd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppUnitmd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">CppUnitmt</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppUnitmt</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
<Midl> <Midl>
@@ -119,7 +119,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -154,12 +154,12 @@
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<OutputFile>..\bin\CppUnitd.dll</OutputFile> <OutputFile>..\bin\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin\CppUnitd.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>..\bin\$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>..\lib\CppUnitd.lib</ImportLibrary> <ImportLibrary>..\lib\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -169,7 +169,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -202,12 +202,12 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\bin\CppUnit.dll</OutputFile> <OutputFile>..\bin\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile> <ProgramDatabaseFile>
</ProgramDatabaseFile> </ProgramDatabaseFile>
<ImportLibrary>..\lib\CppUnit.lib</ImportLibrary> <ImportLibrary>..\lib\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -217,7 +217,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -239,7 +239,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\CppUnitmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -251,7 +251,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -260,7 +260,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -293,7 +293,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
@@ -302,7 +302,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -324,7 +324,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib\CppUnitmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -336,7 +336,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -345,7 +345,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -378,7 +378,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib\CppUnitmt.lib</OutputFile> <OutputFile>..\lib\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@@ -392,22 +392,22 @@
<ClCompile Include="src\TextTestResult.cpp" /> <ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h" /> <ClInclude Include="include\Poco\CppUnit\$(TargetName).h" />
<ClInclude Include="include\CppUnit\CppUnitException.h" /> <ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\CppUnit\estring.h" /> <ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\CppUnit\Guards.h" /> <ClInclude Include="include\Poco\CppUnit\Guards.h" />
<ClInclude Include="include\CppUnit\Orthodox.h" /> <ClInclude Include="include\Poco\CppUnit\Orthodox.h" />
<ClInclude Include="include\CppUnit\RepeatedTest.h" /> <ClInclude Include="include\Poco\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\CppUnit\Test.h" /> <ClInclude Include="include\Poco\CppUnit\Test.h" />
<ClInclude Include="include\CppUnit\TestCaller.h" /> <ClInclude Include="include\Poco\CppUnit\TestCaller.h" />
<ClInclude Include="include\CppUnit\TestCase.h" /> <ClInclude Include="include\Poco\CppUnit\TestCase.h" />
<ClInclude Include="include\CppUnit\TestDecorator.h" /> <ClInclude Include="include\Poco\CppUnit\TestDecorator.h" />
<ClInclude Include="include\CppUnit\TestFailure.h" /> <ClInclude Include="include\Poco\CppUnit\TestFailure.h" />
<ClInclude Include="include\CppUnit\TestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TestResult.h" />
<ClInclude Include="include\CppUnit\TestRunner.h" /> <ClInclude Include="include\Poco\CppUnit\TestRunner.h" />
<ClInclude Include="include\CppUnit\TestSetup.h" /> <ClInclude Include="include\Poco\CppUnit\TestSetup.h" />
<ClInclude Include="include\CppUnit\TestSuite.h" /> <ClInclude Include="include\Poco\CppUnit\TestSuite.h" />
<ClInclude Include="include\CppUnit\TextTestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TextTestResult.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View File

@@ -42,7 +42,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib\CppUnit.tlb" TypeLibraryName=".\lib\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -84,13 +84,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ShowProgress="0" ShowProgress="0"
OutputFile="..\bin\CppUnitd.dll" OutputFile="..\bin\$(TargetName).dll"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\bin\CppUnitd.pdb" ProgramDatabaseFile="..\bin\$(TargetName).pdb"
ImportLibrary="..\lib\CppUnitd.lib" ImportLibrary="..\lib\$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@@ -142,7 +142,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib\CppUnit.tlb" TypeLibraryName=".\lib\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -182,12 +182,12 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\bin\CppUnit.dll" OutputFile="..\bin\$(TargetName).dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
ProgramDatabaseFile="" ProgramDatabaseFile=""
ImportLibrary="..\lib\CppUnit.lib" ImportLibrary="..\lib\$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@@ -239,7 +239,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib\CppUnit.tlb" TypeLibraryName=".\lib\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -259,7 +259,7 @@
PrecompiledHeaderFile="" PrecompiledHeaderFile=""
AssemblerListingLocation="" AssemblerListingLocation=""
ObjectFile="$(IntDir)/" ObjectFile="$(IntDir)/"
ProgramDataBaseFileName="..\lib\CppUnitmdd.pdb" ProgramDataBaseFileName="..\lib\$(TargetName).pdb"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
@@ -280,7 +280,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib\CppUnitmdd.lib" OutputFile="..\lib\$(TargetName).lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@@ -325,7 +325,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib\CppUnit.tlb" TypeLibraryName=".\lib\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -365,7 +365,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib\CppUnitmd.lib" OutputFile="..\lib\$(TargetName).lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@@ -410,7 +410,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib\CppUnit.tlb" TypeLibraryName=".\lib\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -430,7 +430,7 @@
PrecompiledHeaderFile="" PrecompiledHeaderFile=""
AssemblerListingLocation="" AssemblerListingLocation=""
ObjectFile="$(IntDir)/" ObjectFile="$(IntDir)/"
ProgramDataBaseFileName="..\lib\CppUnitmtd.pdb" ProgramDataBaseFileName="..\lib\$(TargetName).pdb"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
@@ -451,7 +451,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib\CppUnitmtd.lib" OutputFile="..\lib\$(TargetName).lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@@ -496,7 +496,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib\CppUnit.tlb" TypeLibraryName=".\lib\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -536,7 +536,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib\CppUnitmt.lib" OutputFile="..\lib\$(TargetName).lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@@ -600,67 +600,67 @@
Filter="*.h" Filter="*.h"
> >
<File <File
RelativePath=".\include\CppUnit\CppUnit.h" RelativePath=".\include\Poco\CppUnit\$(TargetName).h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\CppUnitException.h" RelativePath=".\include\Poco\CppUnit\CppUnitException.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\estring.h" RelativePath=".\include\Poco\CppUnit\estring.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\Guards.h" RelativePath=".\include\Poco\CppUnit\Guards.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\Orthodox.h" RelativePath=".\include\Poco\CppUnit\Orthodox.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\RepeatedTest.h" RelativePath=".\include\Poco\CppUnit\RepeatedTest.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\Test.h" RelativePath=".\include\Poco\CppUnit\Test.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestCaller.h" RelativePath=".\include\Poco\CppUnit\TestCaller.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestCase.h" RelativePath=".\include\Poco\CppUnit\TestCase.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestDecorator.h" RelativePath=".\include\Poco\CppUnit\TestDecorator.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestFailure.h" RelativePath=".\include\Poco\CppUnit\TestFailure.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestResult.h" RelativePath=".\include\Poco\CppUnit\TestResult.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestRunner.h" RelativePath=".\include\Poco\CppUnit\TestRunner.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestSetup.h" RelativePath=".\include\Poco\CppUnit\TestSetup.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestSuite.h" RelativePath=".\include\Poco\CppUnit\TestSuite.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TextTestResult.h" RelativePath=".\include\Poco\CppUnit\TextTestResult.h"
> >
</File> </File>
</Filter> </Filter>

View File

@@ -100,12 +100,12 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">CppUnit64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">$(ProjectName)64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">CppUnitmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">$(ProjectName)mdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">CppUnitmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">$(ProjectName)mtd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">CppUnit64</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">$(ProjectName)64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">CppUnit64md</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">$(ProjectName)64md</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">CppUnit64mt</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">$(ProjectName)64mt</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
<Midl> <Midl>
@@ -113,7 +113,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -148,12 +148,12 @@
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<OutputFile>..\bin64\CppUnit64d.dll</OutputFile> <OutputFile>..\bin64\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin64\CppUnit64d.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>..\bin64\$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>..\lib64\CppUnitd.lib</ImportLibrary> <ImportLibrary>..\lib64\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -163,7 +163,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -196,12 +196,12 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\bin64\CppUnit64.dll</OutputFile> <OutputFile>..\bin64\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile> <ProgramDatabaseFile>
</ProgramDatabaseFile> </ProgramDatabaseFile>
<ImportLibrary>..\lib64\CppUnit.lib</ImportLibrary> <ImportLibrary>..\lib64\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -211,7 +211,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -233,7 +233,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib64\CppUnitmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib64\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -245,7 +245,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -254,7 +254,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -287,7 +287,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
@@ -296,7 +296,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -318,7 +318,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib64\CppUnitmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib64\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -330,7 +330,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -339,7 +339,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -372,7 +372,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmt.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@@ -386,22 +386,22 @@
<ClCompile Include="src\TextTestResult.cpp" /> <ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h" /> <ClInclude Include="include\Poco\CppUnit\$(TargetName).h" />
<ClInclude Include="include\CppUnit\CppUnitException.h" /> <ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\CppUnit\estring.h" /> <ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\CppUnit\Guards.h" /> <ClInclude Include="include\Poco\CppUnit\Guards.h" />
<ClInclude Include="include\CppUnit\Orthodox.h" /> <ClInclude Include="include\Poco\CppUnit\Orthodox.h" />
<ClInclude Include="include\CppUnit\RepeatedTest.h" /> <ClInclude Include="include\Poco\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\CppUnit\Test.h" /> <ClInclude Include="include\Poco\CppUnit\Test.h" />
<ClInclude Include="include\CppUnit\TestCaller.h" /> <ClInclude Include="include\Poco\CppUnit\TestCaller.h" />
<ClInclude Include="include\CppUnit\TestCase.h" /> <ClInclude Include="include\Poco\CppUnit\TestCase.h" />
<ClInclude Include="include\CppUnit\TestDecorator.h" /> <ClInclude Include="include\Poco\CppUnit\TestDecorator.h" />
<ClInclude Include="include\CppUnit\TestFailure.h" /> <ClInclude Include="include\Poco\CppUnit\TestFailure.h" />
<ClInclude Include="include\CppUnit\TestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TestResult.h" />
<ClInclude Include="include\CppUnit\TestRunner.h" /> <ClInclude Include="include\Poco\CppUnit\TestRunner.h" />
<ClInclude Include="include\CppUnit\TestSetup.h" /> <ClInclude Include="include\Poco\CppUnit\TestSetup.h" />
<ClInclude Include="include\CppUnit\TestSuite.h" /> <ClInclude Include="include\Poco\CppUnit\TestSuite.h" />
<ClInclude Include="include\CppUnit\TextTestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TextTestResult.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View File

@@ -106,12 +106,12 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">CppUnit64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">$(ProjectName)64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">CppUnitmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">$(ProjectName)mdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">CppUnitmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">$(ProjectName)mtd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">CppUnit64</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">$(ProjectName)64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">CppUnit64md</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">$(ProjectName)64md</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">CppUnit64mt</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">$(ProjectName)64mt</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
<Midl> <Midl>
@@ -119,7 +119,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -154,12 +154,12 @@
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<OutputFile>..\bin64\CppUnit64d.dll</OutputFile> <OutputFile>..\bin64\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin64\CppUnit64d.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>..\bin64\$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>..\lib64\CppUnitd.lib</ImportLibrary> <ImportLibrary>..\lib64\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -169,7 +169,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -202,12 +202,12 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\bin64\CppUnit64.dll</OutputFile> <OutputFile>..\bin64\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile> <ProgramDatabaseFile>
</ProgramDatabaseFile> </ProgramDatabaseFile>
<ImportLibrary>..\lib64\CppUnit.lib</ImportLibrary> <ImportLibrary>..\lib64\$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -217,7 +217,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -239,7 +239,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib64\CppUnitmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib64\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -251,7 +251,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -260,7 +260,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -293,7 +293,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
@@ -302,7 +302,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -324,7 +324,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib64\CppUnitmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib64\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -336,7 +336,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -345,7 +345,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -378,7 +378,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmt.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@@ -392,22 +392,22 @@
<ClCompile Include="src\TextTestResult.cpp" /> <ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h" /> <ClInclude Include="include\Poco\CppUnit\$(TargetName).h" />
<ClInclude Include="include\CppUnit\CppUnitException.h" /> <ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\CppUnit\estring.h" /> <ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\CppUnit\Guards.h" /> <ClInclude Include="include\Poco\CppUnit\Guards.h" />
<ClInclude Include="include\CppUnit\Orthodox.h" /> <ClInclude Include="include\Poco\CppUnit\Orthodox.h" />
<ClInclude Include="include\CppUnit\RepeatedTest.h" /> <ClInclude Include="include\Poco\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\CppUnit\Test.h" /> <ClInclude Include="include\Poco\CppUnit\Test.h" />
<ClInclude Include="include\CppUnit\TestCaller.h" /> <ClInclude Include="include\Poco\CppUnit\TestCaller.h" />
<ClInclude Include="include\CppUnit\TestCase.h" /> <ClInclude Include="include\Poco\CppUnit\TestCase.h" />
<ClInclude Include="include\CppUnit\TestDecorator.h" /> <ClInclude Include="include\Poco\CppUnit\TestDecorator.h" />
<ClInclude Include="include\CppUnit\TestFailure.h" /> <ClInclude Include="include\Poco\CppUnit\TestFailure.h" />
<ClInclude Include="include\CppUnit\TestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TestResult.h" />
<ClInclude Include="include\CppUnit\TestRunner.h" /> <ClInclude Include="include\Poco\CppUnit\TestRunner.h" />
<ClInclude Include="include\CppUnit\TestSetup.h" /> <ClInclude Include="include\Poco\CppUnit\TestSetup.h" />
<ClInclude Include="include\CppUnit\TestSuite.h" /> <ClInclude Include="include\Poco\CppUnit\TestSuite.h" />
<ClInclude Include="include\CppUnit\TextTestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TextTestResult.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View File

@@ -106,12 +106,12 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">CppUnit64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">Poco$(ProjectName)64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">CppUnitmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">Poco$(ProjectName)mdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">CppUnitmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">Poco$(ProjectName)mtd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">CppUnit64</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">Poco$(ProjectName)64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">CppUnit64md</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">Poco$(ProjectName)md</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">CppUnit64mt</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">Poco$(ProjectName)mt</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
<Midl> <Midl>
@@ -119,7 +119,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -154,12 +154,12 @@
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<OutputFile>..\bin64\CppUnit64d.dll</OutputFile> <OutputFile>..\bin64\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin64\CppUnit64d.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>..\bin64\$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>..\lib64\CppUnitd.lib</ImportLibrary> <ImportLibrary>..\lib64\Poco$(ProjectName)d.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -169,7 +169,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -202,12 +202,12 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\bin64\CppUnit64.dll</OutputFile> <OutputFile>..\bin64\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile> <ProgramDatabaseFile>
</ProgramDatabaseFile> </ProgramDatabaseFile>
<ImportLibrary>..\lib64\CppUnit.lib</ImportLibrary> <ImportLibrary>..\lib64\Poco$(ProjectName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -217,7 +217,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -239,7 +239,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib64\CppUnitmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib64\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -251,7 +251,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -260,7 +260,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -293,7 +293,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
@@ -302,7 +302,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -324,7 +324,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib64\CppUnitmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib64\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -336,7 +336,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -345,7 +345,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -378,7 +378,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmt.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@@ -392,22 +392,22 @@
<ClCompile Include="src\TextTestResult.cpp" /> <ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h" /> <ClInclude Include="include\Poco\CppUnit\$(TargetName).h" />
<ClInclude Include="include\CppUnit\CppUnitException.h" /> <ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\CppUnit\estring.h" /> <ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\CppUnit\Guards.h" /> <ClInclude Include="include\Poco\CppUnit\Guards.h" />
<ClInclude Include="include\CppUnit\Orthodox.h" /> <ClInclude Include="include\Poco\CppUnit\Orthodox.h" />
<ClInclude Include="include\CppUnit\RepeatedTest.h" /> <ClInclude Include="include\Poco\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\CppUnit\Test.h" /> <ClInclude Include="include\Poco\CppUnit\Test.h" />
<ClInclude Include="include\CppUnit\TestCaller.h" /> <ClInclude Include="include\Poco\CppUnit\TestCaller.h" />
<ClInclude Include="include\CppUnit\TestCase.h" /> <ClInclude Include="include\Poco\CppUnit\TestCase.h" />
<ClInclude Include="include\CppUnit\TestDecorator.h" /> <ClInclude Include="include\Poco\CppUnit\TestDecorator.h" />
<ClInclude Include="include\CppUnit\TestFailure.h" /> <ClInclude Include="include\Poco\CppUnit\TestFailure.h" />
<ClInclude Include="include\CppUnit\TestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TestResult.h" />
<ClInclude Include="include\CppUnit\TestRunner.h" /> <ClInclude Include="include\Poco\CppUnit\TestRunner.h" />
<ClInclude Include="include\CppUnit\TestSetup.h" /> <ClInclude Include="include\Poco\CppUnit\TestSetup.h" />
<ClInclude Include="include\CppUnit\TestSuite.h" /> <ClInclude Include="include\Poco\CppUnit\TestSuite.h" />
<ClInclude Include="include\CppUnit\TextTestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TextTestResult.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View File

@@ -106,12 +106,12 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">CppUnit64d</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppUnit64d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">CppUnitmdd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppUnitmdd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">CppUnitmtd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppUnitmtd</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">CppUnit64</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCppUnit64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">CppUnit64md</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppUnit64md</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">CppUnit64mt</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppUnit64mt</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
<Midl> <Midl>
@@ -119,7 +119,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -154,12 +154,12 @@
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<OutputFile>..\bin64\CppUnit64d.dll</OutputFile> <OutputFile>..\bin64\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\bin64\CppUnit64d.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>..\bin64\$(TargetName).pdb</ProgramDatabaseFile>
<ImportLibrary>..\lib64\CppUnitd.lib</ImportLibrary> <ImportLibrary>..\lib64\PocoCppUnit64d.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -169,7 +169,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -202,12 +202,12 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Link> <Link>
<OutputFile>..\bin64\CppUnit64.dll</OutputFile> <OutputFile>..\bin64\$(TargetName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile> <ProgramDatabaseFile>
</ProgramDatabaseFile> </ProgramDatabaseFile>
<ImportLibrary>..\lib64\CppUnit.lib</ImportLibrary> <ImportLibrary>..\lib64\PocoCppUnit64.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@@ -217,7 +217,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -239,7 +239,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib64\CppUnitmdd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib64\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -251,7 +251,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmdd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -260,7 +260,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -293,7 +293,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
@@ -302,7 +302,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -324,7 +324,7 @@
<AssemblerListingLocation> <AssemblerListingLocation>
</AssemblerListingLocation> </AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>..\lib64\CppUnitmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib64\$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -336,7 +336,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmtd.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -345,7 +345,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\lib64\CppUnit.tlb</TypeLibraryName> <TypeLibraryName>.\lib64\$(TargetName).tlb</TypeLibraryName>
<HeaderFileName> <HeaderFileName>
</HeaderFileName> </HeaderFileName>
</Midl> </Midl>
@@ -378,7 +378,7 @@
<Culture>0x0c07</Culture> <Culture>0x0c07</Culture>
</ResourceCompile> </ResourceCompile>
<Lib> <Lib>
<OutputFile>..\lib64\CppUnitmt.lib</OutputFile> <OutputFile>..\lib64\$(TargetName).lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@@ -392,22 +392,22 @@
<ClCompile Include="src\TextTestResult.cpp" /> <ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h" /> <ClInclude Include="include\Poco\CppUnit\$(TargetName).h" />
<ClInclude Include="include\CppUnit\CppUnitException.h" /> <ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\CppUnit\estring.h" /> <ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\CppUnit\Guards.h" /> <ClInclude Include="include\Poco\CppUnit\Guards.h" />
<ClInclude Include="include\CppUnit\Orthodox.h" /> <ClInclude Include="include\Poco\CppUnit\Orthodox.h" />
<ClInclude Include="include\CppUnit\RepeatedTest.h" /> <ClInclude Include="include\Poco\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\CppUnit\Test.h" /> <ClInclude Include="include\Poco\CppUnit\Test.h" />
<ClInclude Include="include\CppUnit\TestCaller.h" /> <ClInclude Include="include\Poco\CppUnit\TestCaller.h" />
<ClInclude Include="include\CppUnit\TestCase.h" /> <ClInclude Include="include\Poco\CppUnit\TestCase.h" />
<ClInclude Include="include\CppUnit\TestDecorator.h" /> <ClInclude Include="include\Poco\CppUnit\TestDecorator.h" />
<ClInclude Include="include\CppUnit\TestFailure.h" /> <ClInclude Include="include\Poco\CppUnit\TestFailure.h" />
<ClInclude Include="include\CppUnit\TestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TestResult.h" />
<ClInclude Include="include\CppUnit\TestRunner.h" /> <ClInclude Include="include\Poco\CppUnit\TestRunner.h" />
<ClInclude Include="include\CppUnit\TestSetup.h" /> <ClInclude Include="include\Poco\CppUnit\TestSetup.h" />
<ClInclude Include="include\CppUnit\TestSuite.h" /> <ClInclude Include="include\Poco\CppUnit\TestSuite.h" />
<ClInclude Include="include\CppUnit\TextTestResult.h" /> <ClInclude Include="include\Poco\CppUnit\TextTestResult.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View File

@@ -42,7 +42,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib64\CppUnit.tlb" TypeLibraryName=".\lib64\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -84,13 +84,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ShowProgress="0" ShowProgress="0"
OutputFile="..\bin64\CppUnit64d.dll" OutputFile="..\bin64\$(TargetName).dll"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\bin64\CppUnit64d.pdb" ProgramDatabaseFile="..\bin64\$(TargetName).pdb"
ImportLibrary="..\lib64\CppUnitd.lib" ImportLibrary="..\lib64\$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@@ -142,7 +142,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib64\CppUnit.tlb" TypeLibraryName=".\lib64\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -182,12 +182,12 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\bin64\CppUnit64.dll" OutputFile="..\bin64\$(TargetName).dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
ProgramDatabaseFile="" ProgramDatabaseFile=""
ImportLibrary="..\lib64\CppUnit.lib" ImportLibrary="..\lib64\$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@@ -239,7 +239,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib64\CppUnit.tlb" TypeLibraryName=".\lib64\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -280,7 +280,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib64\CppUnitmdd.lib" OutputFile="..\lib64\$(TargetName).lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@@ -325,7 +325,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib64\CppUnit.tlb" TypeLibraryName=".\lib64\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -365,7 +365,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib64\CppUnitmd.lib" OutputFile="..\lib64\$(TargetName).lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@@ -410,7 +410,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib64\CppUnit.tlb" TypeLibraryName=".\lib64\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -451,7 +451,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib64\CppUnitmtd.lib" OutputFile="..\lib64\$(TargetName).lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@@ -496,7 +496,7 @@
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\lib64\CppUnit.tlb" TypeLibraryName=".\lib64\$(TargetName).tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
@@ -536,7 +536,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib64\CppUnitmt.lib" OutputFile="..\lib64\$(TargetName).lib"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@@ -600,67 +600,67 @@
Filter="*.h" Filter="*.h"
> >
<File <File
RelativePath=".\include\CppUnit\CppUnit.h" RelativePath=".\include\Poco\CppUnit\$(TargetName).h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\CppUnitException.h" RelativePath=".\include\Poco\CppUnit\CppUnitException.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\estring.h" RelativePath=".\include\Poco\CppUnit\estring.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\Guards.h" RelativePath=".\include\Poco\CppUnit\Guards.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\Orthodox.h" RelativePath=".\include\Poco\CppUnit\Orthodox.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\RepeatedTest.h" RelativePath=".\include\Poco\CppUnit\RepeatedTest.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\Test.h" RelativePath=".\include\Poco\CppUnit\Test.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestCaller.h" RelativePath=".\include\Poco\CppUnit\TestCaller.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestCase.h" RelativePath=".\include\Poco\CppUnit\TestCase.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestDecorator.h" RelativePath=".\include\Poco\CppUnit\TestDecorator.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestFailure.h" RelativePath=".\include\Poco\CppUnit\TestFailure.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestResult.h" RelativePath=".\include\Poco\CppUnit\TestResult.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestRunner.h" RelativePath=".\include\Poco\CppUnit\TestRunner.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestSetup.h" RelativePath=".\include\Poco\CppUnit\TestSetup.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TestSuite.h" RelativePath=".\include\Poco\CppUnit\TestSuite.h"
> >
</File> </File>
<File <File
RelativePath=".\include\CppUnit\TextTestResult.h" RelativePath=".\include\Poco\CppUnit\TextTestResult.h"
> >
</File> </File>
</Filter> </Filter>

View File

@@ -1,7 +1,7 @@
# #
# Makefile # Makefile
# #
# $Id: //poco/1.4/CppUnit/Makefile#1 $ # $Id: //poco/1.4/PocoCppUnit/Makefile#1 $
# #
# Makefile for Poco CppUnit # Makefile for Poco CppUnit
# #

View File

@@ -20,7 +20,7 @@ set_target_properties( "${LIBNAME}"
PROPERTIES PROPERTIES
VERSION "1" SOVERSION "1" VERSION "1" SOVERSION "1"
DEFINE_SYMBOL WinTestRunner_EXPORTS) DEFINE_SYMBOL WinTestRunner_EXPORTS)
target_link_libraries( "${LIBNAME}" CppUnit ) target_link_libraries( "${LIBNAME}" PocoCppUnit )
target_include_directories( "${LIBNAME}" target_include_directories( "${LIBNAME}"
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

View File

@@ -22,7 +22,7 @@
#endif #endif
#include "CppUnit/CppUnit.h" #include "Poco/CppUnit/CppUnit.h"
#include <vector> #include <vector>
#include <afxwin.h> #include <afxwin.h>

View File

@@ -9,8 +9,8 @@
#define ActiveTest_INCLUDED #define ActiveTest_INCLUDED
#include "CppUnit/CppUnit.h" #include "Poco/CppUnit/CppUnit.h"
#include "CppUnit/TestDecorator.h" #include "Poco/CppUnit/TestDecorator.h"
#include <afxmt.h> #include <afxmt.h>

View File

@@ -9,8 +9,8 @@
#define GuiTestResult_INCLUDED #define GuiTestResult_INCLUDED
#include "CppUnit/CppUnit.h" #include "Poco/CppUnit/CppUnit.h"
#include "CppUnit/TestResult.h" #include "Poco/CppUnit/TestResult.h"
#include <afxmt.h> #include <afxmt.h>

View File

@@ -9,7 +9,7 @@
#define ProgressBar_INCLUDED #define ProgressBar_INCLUDED
#include "CppUnit/CppUnit.h" #include "Poco/CppUnit/CppUnit.h"
#include <afxwin.h> #include <afxwin.h>

View File

@@ -13,7 +13,7 @@
#include "ActiveTest.h" #include "ActiveTest.h"
#include "GUITestResult.h" #include "GUITestResult.h"
#include "ProgressBar.h" #include "ProgressBar.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "TestRunnerDlg.h" #include "TestRunnerDlg.h"

View File

@@ -9,8 +9,8 @@
#define TestRunnerDlg_INCLUDED #define TestRunnerDlg_INCLUDED
#include "CppUnit/CppUnit.h" #include "Poco/CppUnit/CppUnit.h"
#include "CppUnit/CppUnitException.h" #include "Poco/CppUnit/CppUnitException.h"
#include "ActiveTest.h" #include "ActiveTest.h"
#include <vector> #include <vector>
#include "../res/Resource.h" #include "../res/Resource.h"

View File

@@ -7,7 +7,7 @@
#include "WinTestRunner/WinTestRunner.h" #include "WinTestRunner/WinTestRunner.h"
#include "TestRunnerDlg.h" #include "TestRunnerDlg.h"
#include "CppUnit/TestRunner.h" #include "Poco/CppUnit/TestRunner.h"
#include <fstream> #include <fstream>

View File

@@ -24,23 +24,52 @@
// from a DLL simpler. All files within this DLL are compiled with the Poco_CppUnitEXPORTS // from a DLL simpler. All files within this DLL are compiled with the Poco_CppUnitEXPORTS
// symbol defined on the command line. this symbol should not be defined on any project // symbol defined on the command line. this symbol should not be defined on any project
// that uses this DLL. This way any other project whose source files include this file see // that uses this DLL. This way any other project whose source files include this file see
// Poco_CppUnit_API functions as being imported from a DLL, wheras this DLL sees symbols // CppUnit_API functions as being imported from a DLL, wheras this DLL sees symbols
// defined with this macro as being exported. // defined with this macro as being exported.
// //
#if defined(_WIN32) && defined(POCO_DLL) #if defined(_WIN32) && defined(POCO_DLL)
#if defined(Poco_CppUnit_EXPORTS) #if defined(CppUnit_EXPORTS)
#define Poco_CppUnit_API __declspec(dllexport) #define CppUnit_API __declspec(dllexport)
#else #else
#define Poco_CppUnit_API __declspec(dllimport) #define CppUnit_API __declspec(dllimport)
#endif #endif
#endif #endif
#if !defined(Poco_CppUnit_API) #if !defined(CppUnit_API)
#if defined (__GNUC__) && (__GNUC__ >= 4) #if defined (__GNUC__) && (__GNUC__ >= 4)
#define Poco_CppUnit_API __attribute__ ((visibility ("default"))) #define CppUnit_API __attribute__ ((visibility ("default")))
#else #else
#define Poco_CppUnit_API #define CppUnit_API
#endif
#endif
//
// Automatically link Foundation library.
//
#if defined(_MSC_VER)
#if defined(POCO_DLL)
#if defined(_DEBUG)
#define POCO_LIB_SUFFIX "d.lib"
#else
#define POCO_LIB_SUFFIX ".lib"
#endif
#elif defined(_DLL)
#if defined(_DEBUG)
#define POCO_LIB_SUFFIX "mdd.lib"
#else
#define POCO_LIB_SUFFIX "md.lib"
#endif
#else
#if defined(_DEBUG)
#define POCO_LIB_SUFFIX "mtd.lib"
#else
#define POCO_LIB_SUFFIX "mt.lib"
#endif
#endif
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(CppUnit_EXPORTS)
#pragma comment(lib, "PocoCppUnit" POCO_LIB_SUFFIX)
#endif #endif
#endif #endif

View File

@@ -17,7 +17,7 @@
namespace CppUnit { namespace CppUnit {
class Poco_CppUnit_API CppUnitException: public std::exception class CppUnit_API CppUnitException: public std::exception
/// CppUnitException is an exception that serves /// CppUnitException is an exception that serves
/// descriptive strings through its what() method /// descriptive strings through its what() method
{ {

View File

@@ -26,7 +26,7 @@ class TestResult;
* Does not assume ownership of the test it decorates * Does not assume ownership of the test it decorates
* *
*/ */
class Poco_CppUnit_API RepeatedTest: public TestDecorator class CppUnit_API RepeatedTest: public TestDecorator
{ {
REFERENCEOBJECT (RepeatedTest) REFERENCEOBJECT (RepeatedTest)

View File

@@ -24,7 +24,7 @@ class TestResult;
* See TestResult. * See TestResult.
* *
*/ */
class Poco_CppUnit_API Test class CppUnit_API Test
{ {
public: public:
virtual ~Test() = 0; virtual ~Test() = 0;

View File

@@ -96,7 +96,7 @@ private:
} // namespace CppUnit } // namespace CppUnit
#define Poco_CppUnit_addTest(suite, cls, mth) \ #define CppUnit_addTest(suite, cls, mth) \
suite->addTest(new CppUnit::TestCaller<cls>(#mth, &cls::mth)) suite->addTest(new CppUnit::TestCaller<cls>(#mth, &cls::mth))

View File

@@ -83,7 +83,7 @@ class TestResult;
* see TestResult, TestSuite and TestCaller * see TestResult, TestSuite and TestCaller
* *
*/ */
class Poco_CppUnit_API TestCase: public Test class CppUnit_API TestCase: public Test
{ {
REFERENCEOBJECT (TestCase) REFERENCEOBJECT (TestCase)

View File

@@ -26,7 +26,7 @@ class TestResult;
* Does not assume ownership of the test it decorates * Does not assume ownership of the test it decorates
* *
*/ */
class Poco_CppUnit_API TestDecorator: public Test class CppUnit_API TestDecorator: public Test
{ {
REFERENCEOBJECT(TestDecorator) REFERENCEOBJECT(TestDecorator)

View File

@@ -33,7 +33,7 @@ class Test;
* see TestSuite * see TestSuite
* *
*/ */
class Poco_CppUnit_API TestFailure class CppUnit_API TestFailure
{ {
REFERENCEOBJECT (TestFailure) REFERENCEOBJECT (TestFailure)

View File

@@ -41,7 +41,7 @@ class Test;
* *
* see Test * see Test
*/ */
class Poco_CppUnit_API TestResult class CppUnit_API TestResult
{ {
REFERENCEOBJECT (TestResult) REFERENCEOBJECT (TestResult)

View File

@@ -38,7 +38,7 @@ class Test;
* TestRunner [-all] [-print] [-wait] ExampleTestCase * TestRunner [-all] [-print] [-wait] ExampleTestCase
* *
*/ */
class Poco_CppUnit_API TestRunner class CppUnit_API TestRunner
{ {
typedef std::pair<std::string, Test*> Mapping; typedef std::pair<std::string, Test*> Mapping;
typedef std::vector<Mapping> Mappings; typedef std::vector<Mapping> Mappings;

View File

@@ -21,7 +21,7 @@ class Test;
class TestResult; class TestResult;
class Poco_CppUnit_API TestSetup: public TestDecorator class CppUnit_API TestSetup: public TestDecorator
{ {
REFERENCEOBJECT (TestSetup) REFERENCEOBJECT (TestSetup)

View File

@@ -35,7 +35,7 @@ class TestResult;
* *
* see Test and TestCaller * see Test and TestCaller
*/ */
class Poco_CppUnit_API TestSuite: public Test class CppUnit_API TestSuite: public Test
{ {
REFERENCEOBJECT (TestSuite) REFERENCEOBJECT (TestSuite)

View File

@@ -18,7 +18,7 @@
namespace CppUnit { namespace CppUnit {
class Poco_CppUnit_API TextTestResult: public TestResult class CppUnit_API TextTestResult: public TestResult
{ {
public: public:
TextTestResult(); TextTestResult();

View File

@@ -18,7 +18,7 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE
add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_executable( ${TESTUNIT} ${TEST_SRCS} )
add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all)
target_link_libraries( ${TESTUNIT} PocoCrypto PocoXML PocoUtil PocoFoundation CppUnit ) target_link_libraries( ${TESTUNIT} PocoCrypto PocoXML PocoUtil PocoFoundation PocoCppUnit )
if(UNIX) if(UNIX)
target_link_libraries( ${TESTUNIT} pthread) target_link_libraries( ${TESTUNIT} pthread)
endif(UNIX) endif(UNIX)

View File

@@ -20,6 +20,6 @@ objects = CryptoTestSuite Driver \
target = testrunner target = testrunner
target_version = 1 target_version = 1
target_libs = PocoCrypto PocoFoundation CppUnit target_libs = PocoCrypto PocoFoundation PocoCppUnit
include $(POCO_BASE)/build/rules/exec include $(POCO_BASE)/build/rules/exec

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuited.exe</OutputFile> <OutputFile>bin\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuite.exe</OutputFile> <OutputFile>bin\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuited.exe</OutputFile> <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuite.exe</OutputFile> <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuited.exe</OutputFile> <OutputFile>bin64\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuite.exe</OutputFile> <OutputFile>bin64\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuited.exe</OutputFile> <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuite.exe</OutputFile> <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -11,8 +11,8 @@
#include "CryptoTest.h" #include "CryptoTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/Crypto/CipherFactory.h" #include "Poco/Crypto/CipherFactory.h"
#include "Poco/Crypto/Cipher.h" #include "Poco/Crypto/Cipher.h"
#include "Poco/Crypto/CipherKey.h" #include "Poco/Crypto/CipherKey.h"

View File

@@ -17,7 +17,7 @@
#include "Poco/Crypto/Crypto.h" #include "Poco/Crypto/Crypto.h"
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
class CryptoTest: public CppUnit::TestCase class CryptoTest: public CppUnit::TestCase

View File

@@ -16,7 +16,7 @@
#define CryptoTestSuite_INCLUDED #define CryptoTestSuite_INCLUDED
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
class CryptoTestSuite class CryptoTestSuite

View File

@@ -11,8 +11,8 @@
#include "DigestEngineTest.h" #include "DigestEngineTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/Crypto/DigestEngine.h" #include "Poco/Crypto/DigestEngine.h"

View File

@@ -17,7 +17,7 @@
#include "Poco/Crypto/Crypto.h" #include "Poco/Crypto/Crypto.h"
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
class DigestEngineTest: public CppUnit::TestCase class DigestEngineTest: public CppUnit::TestCase

View File

@@ -12,7 +12,7 @@
// //
#include "CppUnit/TestRunner.h" #include "Poco/CppUnit/TestRunner.h"
#include "CryptoTestSuite.h" #include "CryptoTestSuite.h"
#include "Poco/Crypto/Crypto.h" #include "Poco/Crypto/Crypto.h"

View File

@@ -11,8 +11,8 @@
#include "RSATest.h" #include "RSATest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/Crypto/RSADigestEngine.h" #include "Poco/Crypto/RSADigestEngine.h"
#include "Poco/Crypto/CipherFactory.h" #include "Poco/Crypto/CipherFactory.h"
#include "Poco/Crypto/Cipher.h" #include "Poco/Crypto/Cipher.h"

View File

@@ -17,7 +17,7 @@
#include "Poco/Crypto/Crypto.h" #include "Poco/Crypto/Crypto.h"
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
class RSATest: public CppUnit::TestCase class RSATest: public CppUnit::TestCase

View File

@@ -12,7 +12,7 @@
// //
#include "CppUnit/TestRunner.h" #include "Poco/CppUnit/TestRunner.h"
#include "CryptoTestSuite.h" #include "CryptoTestSuite.h"
#include "Poco/Crypto/Crypto.h" #include "Poco/Crypto/Crypto.h"
#include <cstdlib> #include <cstdlib>

View File

@@ -14,4 +14,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF
add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_executable( ${TESTUNIT} ${TEST_SRCS} )
add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all)
target_link_libraries( ${TESTUNIT} PocoDataMySQL PocoData PocoFoundation CppUnit ) target_link_libraries( ${TESTUNIT} PocoDataMySQL PocoData PocoFoundation PocoCppUnit )

View File

@@ -17,6 +17,6 @@ objects = MySQLTestSuite Driver MySQLTest SQLExecutor
target = testrunner target = testrunner
target_version = 1 target_version = 1
target_libs = PocoDataMySQL PocoData PocoFoundation CppUnit target_libs = PocoDataMySQL PocoData PocoFoundation PocoCppUnit
include $(POCO_BASE)/build/rules/exec include $(POCO_BASE)/build/rules/exec

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuited.exe</OutputFile> <OutputFile>bin\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuite.exe</OutputFile> <OutputFile>bin\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuited.exe</OutputFile> <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuite.exe</OutputFile> <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuited.exe</OutputFile> <OutputFile>bin64\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuite.exe</OutputFile> <OutputFile>bin64\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuited.exe</OutputFile> <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuite.exe</OutputFile> <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -12,7 +12,7 @@
// //
#include "CppUnit/TestRunner.h" #include "Poco/CppUnit/TestRunner.h"
#include "MySQLTestSuite.h" #include "MySQLTestSuite.h"

View File

@@ -11,8 +11,8 @@
#include "MySQLTest.h" #include "MySQLTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Format.h" #include "Poco/Format.h"
#include "Poco/Tuple.h" #include "Poco/Tuple.h"

View File

@@ -19,7 +19,7 @@
#include "Poco/Data/MySQL/MySQL.h" #include "Poco/Data/MySQL/MySQL.h"
#include "Poco/Data/Session.h" #include "Poco/Data/Session.h"
#include "Poco/SharedPtr.h" #include "Poco/SharedPtr.h"
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
#include "SQLExecutor.h" #include "SQLExecutor.h"

View File

@@ -16,7 +16,7 @@
#define MySQLTestSuite_INCLUDED #define MySQLTestSuite_INCLUDED
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
class MySQLTestSuite class MySQLTestSuite
{ {

View File

@@ -10,7 +10,7 @@
// //
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
#include "SQLExecutor.h" #include "SQLExecutor.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Format.h" #include "Poco/Format.h"

View File

@@ -14,4 +14,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF
add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_executable( ${TESTUNIT} ${TEST_SRCS} )
add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all)
target_link_libraries( ${TESTUNIT} PocoDataODBC PocoData PocoFoundation CppUnit ) target_link_libraries( ${TESTUNIT} PocoDataODBC PocoData PocoFoundation PocoCppUnit )

View File

@@ -37,6 +37,6 @@ endif
target = testrunner target = testrunner
target_version = 1 target_version = 1
target_libs = PocoDataODBC PocoData PocoFoundation CppUnit target_libs = PocoDataODBC PocoData PocoFoundation PocoCppUnit
include $(POCO_BASE)/build/rules/exec include $(POCO_BASE)/build/rules/exec

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuited.exe</OutputFile> <OutputFile>bin\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuite.exe</OutputFile> <OutputFile>bin\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuited.exe</OutputFile> <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuite.exe</OutputFile> <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuited.exe</OutputFile> <OutputFile>bin64\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuite.exe</OutputFile> <OutputFile>bin64\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuited.exe</OutputFile> <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuite.exe</OutputFile> <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -12,7 +12,7 @@
// //
#include "CppUnit/TestRunner.h" #include "Poco/CppUnit/TestRunner.h"
#include "ODBCTestSuite.h" #include "ODBCTestSuite.h"

View File

@@ -11,8 +11,8 @@
#include "ODBCAccessTest.h" #include "ODBCAccessTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Format.h" #include "Poco/Format.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"

View File

@@ -20,7 +20,7 @@
#include "Poco/Data/Session.h" #include "Poco/Data/Session.h"
#include "Poco/Data/ODBC/Utility.h" #include "Poco/Data/ODBC/Utility.h"
#include "Poco/SharedPtr.h" #include "Poco/SharedPtr.h"
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
#include "SQLExecutor.h" #include "SQLExecutor.h"

View File

@@ -11,8 +11,8 @@
#include "ODBCDB2Test.h" #include "ODBCDB2Test.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Format.h" #include "Poco/Format.h"
#include "Poco/Any.h" #include "Poco/Any.h"

View File

@@ -12,8 +12,8 @@
#include "ODBCMySQLTest.h" #include "ODBCMySQLTest.h"
#include "ODBCTest.h" #include "ODBCTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Format.h" #include "Poco/Format.h"
#include "Poco/Tuple.h" #include "Poco/Tuple.h"

View File

@@ -11,8 +11,8 @@
#include "ODBCOracleTest.h" #include "ODBCOracleTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Tuple.h" #include "Poco/Tuple.h"
#include "Poco/Format.h" #include "Poco/Format.h"

View File

@@ -11,8 +11,8 @@
#include "ODBCPostgreSQLTest.h" #include "ODBCPostgreSQLTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "ODBCTest.h" #include "ODBCTest.h"
#include "Poco/Format.h" #include "Poco/Format.h"
#include "Poco/Any.h" #include "Poco/Any.h"

View File

@@ -11,8 +11,8 @@
#include "ODBCSQLServerTest.h" #include "ODBCSQLServerTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Format.h" #include "Poco/Format.h"
#include "Poco/Any.h" #include "Poco/Any.h"

View File

@@ -11,8 +11,8 @@
#include "ODBCSQLiteTest.h" #include "ODBCSQLiteTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Format.h" #include "Poco/Format.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"

View File

@@ -11,8 +11,8 @@
#include "ODBCTest.h" #include "ODBCTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Format.h" #include "Poco/Format.h"
#include "Poco/Any.h" #include "Poco/Any.h"

View File

@@ -17,7 +17,7 @@
#include "Poco/Data/ODBC/ODBC.h" #include "Poco/Data/ODBC/ODBC.h"
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
#include "Poco/Data/Session.h" #include "Poco/Data/Session.h"
#include "Poco/Data/ODBC/Utility.h" #include "Poco/Data/ODBC/Utility.h"
#include "Poco/SharedPtr.h" #include "Poco/SharedPtr.h"

View File

@@ -16,7 +16,7 @@
#define ODBCTestSuite_INCLUDED #define ODBCTestSuite_INCLUDED
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
class ODBCTestSuite class ODBCTestSuite

View File

@@ -10,7 +10,7 @@
// //
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
#include "SQLExecutor.h" #include "SQLExecutor.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Format.h" #include "Poco/Format.h"

View File

@@ -18,4 +18,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE
add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_executable( ${TESTUNIT} ${TEST_SRCS} )
add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all)
target_link_libraries( ${TESTUNIT} PocoDataSQLite PocoData PocoFoundation CppUnit ) target_link_libraries( ${TESTUNIT} PocoDataSQLite PocoData PocoFoundation PocoCppUnit )

View File

@@ -13,6 +13,6 @@ objects = SQLiteTestSuite Driver \
target = testrunner target = testrunner
target_version = 1 target_version = 1
target_libs = PocoDataSQLite PocoData PocoFoundation CppUnit target_libs = PocoDataSQLite PocoData PocoFoundation PocoCppUnit
include $(POCO_BASE)/build/rules/exec include $(POCO_BASE)/build/rules/exec

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuited.exe</OutputFile> <OutputFile>bin\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuite.exe</OutputFile> <OutputFile>bin\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuited.exe</OutputFile> <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuite.exe</OutputFile> <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuited.exe</OutputFile> <OutputFile>bin64\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuite.exe</OutputFile> <OutputFile>bin64\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuited.exe</OutputFile> <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuite.exe</OutputFile> <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -12,7 +12,7 @@
// //
#include "CppUnit/TestRunner.h" #include "Poco/CppUnit/TestRunner.h"
#include "SQLiteTestSuite.h" #include "SQLiteTestSuite.h"

View File

@@ -11,8 +11,8 @@
#include "SQLiteTest.h" #include "SQLiteTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/Data/Date.h" #include "Poco/Data/Date.h"
#include "Poco/Data/Time.h" #include "Poco/Data/Time.h"
#include "Poco/Data/LOB.h" #include "Poco/Data/LOB.h"

View File

@@ -17,7 +17,7 @@
#include "Poco/Data/SQLite/SQLite.h" #include "Poco/Data/SQLite/SQLite.h"
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
namespace Poco { namespace Poco {

View File

@@ -16,7 +16,7 @@
#define SQLiteTestSuite_INCLUDED #define SQLiteTestSuite_INCLUDED
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
class SQLiteTestSuite class SQLiteTestSuite

View File

@@ -12,7 +12,7 @@
// //
#include "CppUnit/TestRunner.h" #include "Poco/CppUnit/TestRunner.h"
#include "SQLiteTestSuite.h" #include "SQLiteTestSuite.h"
#include <cstdlib> #include <cstdlib>

View File

@@ -23,4 +23,4 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF
add_executable( ${TESTUNIT} ${TEST_SRCS} ) add_executable( ${TESTUNIT} ${TEST_SRCS} )
add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all)
target_link_libraries( ${TESTUNIT} PocoData PocoUtil PocoXML PocoFoundation CppUnit) target_link_libraries( ${TESTUNIT} PocoData PocoUtil PocoXML PocoFoundation PocoCppUnit)

View File

@@ -22,6 +22,6 @@ objects = DataTestSuite Driver \
target = testrunner target = testrunner
target_version = 1 target_version = 1
target_libs = PocoData PocoFoundation CppUnit target_libs = PocoData PocoFoundation PocoCppUnit
include $(POCO_BASE)/build/rules/exec include $(POCO_BASE)/build/rules/exec

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuited.exe</OutputFile> <OutputFile>bin\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\TestSuite.exe</OutputFile> <OutputFile>bin\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuited.exe</OutputFile> <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuite.exe</OutputFile> <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -142,7 +142,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuited.exe</OutputFile> <OutputFile>bin64\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\TestSuite.exe</OutputFile> <OutputFile>bin64\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuited.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_mt\TestSuite.exe</OutputFile> <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuited.exe</OutputFile> <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuite.exe</OutputFile> <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>

View File

@@ -11,8 +11,8 @@
#include "DataTest.h" #include "DataTest.h"
#include "CppUnit/TestCaller.h" #include "Poco/CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h" #include "Poco/CppUnit/TestSuite.h"
#include "Poco/Data/Session.h" #include "Poco/Data/Session.h"
#include "Poco/Data/SessionFactory.h" #include "Poco/Data/SessionFactory.h"
#include "Poco/Data/LOB.h" #include "Poco/Data/LOB.h"

View File

@@ -20,7 +20,7 @@
#include "Poco/BinaryReader.h" #include "Poco/BinaryReader.h"
#include "Poco/BinaryWriter.h" #include "Poco/BinaryWriter.h"
#include "Poco/Data/Row.h" #include "Poco/Data/Row.h"
#include "CppUnit/TestCase.h" #include "Poco/CppUnit/TestCase.h"
class DataTest: public CppUnit::TestCase class DataTest: public CppUnit::TestCase

Some files were not shown because too many files have changed in this diff Show More