generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-19 00:46:03 +01:00
Code Issues Projects Releases Wiki Activity

don't use WinTestRunner/MFC in VS2013 test suites

Browse Source
This commit is contained in:
Guenter Obiltschnig 2014-04-21 20:55:18 +02:00
parent 7a7a1a507b
commit f80c16b53a
14 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ProGen/templates/vs120/Win32/testsuite/debug_shared.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin\"
IntermediateDirectory="obj\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="2"
CharacterSet="2"
>
<Tool
@ -53,14 +52,14 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
OutputFile="bin\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin\${project.target}d.pdb"
SubSystem="2"
SubSystem="1"
TargetMachine="1"
AdditionalOptions="${configuration.linker.additionalOptions}"
/>

5
ProGen/templates/vs120/Win32/testsuite/debug_static_md.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin\static_md\"
IntermediateDirectory="obj\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="2"
CharacterSet="2"
>
<Tool
@ -53,14 +52,14 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
OutputFile="bin\static_md\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin\static_md\${project.target}d.pdb"
SubSystem="2"
SubSystem="1"
TargetMachine="1"
AdditionalOptions="${configuration.linker.additionalOptions}"
/>

6
ProGen/templates/vs120/Win32/testsuite/debug_static_mt.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin\static_mt\"
IntermediateDirectory="obj\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="1"
CharacterSet="2"
>
<Tool
@ -53,15 +52,14 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
OutputFile="bin\static_mt\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib"
IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb"
SubSystem="2"
SubSystem="1"
TargetMachine="1"
AdditionalOptions="${configuration.linker.additionalOptions}"
/>

1
ProGen/templates/vs120/Win32/testsuite/project.properties
View File

@ -7,3 +7,4 @@ project.targetSuffix.debug_static_mt = d
project.targetSuffix.release_static_mt =
project.postprocess = upgrade2008to2013
project.finalSuffix = _vs120.vcxproj
project.replaceSourceFiles = .\\src\\WinDriver.cpp > .\\src\\Driver.cpp

5
ProGen/templates/vs120/Win32/testsuite/release_shared.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin\"
IntermediateDirectory="obj\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="2"
CharacterSet="2"
>
<Tool
@ -55,12 +54,12 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
OutputFile="bin\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib"
GenerateDebugInformation="false"
SubSystem="2"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"

5
ProGen/templates/vs120/Win32/testsuite/release_static_md.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin\static_md\"
IntermediateDirectory="obj\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="2"
CharacterSet="2"
>
<Tool
@ -55,12 +54,12 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
OutputFile="bin\static_md\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib"
GenerateDebugInformation="false"
SubSystem="2"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"

6
ProGen/templates/vs120/Win32/testsuite/release_static_mt.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin\static_mt\"
IntermediateDirectory="obj\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="1"
CharacterSet="2"
>
<Tool
@ -55,13 +54,12 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
OutputFile="bin\static_mt\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib"
IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
GenerateDebugInformation="false"
SubSystem="2"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"

5
ProGen/templates/vs120/x64/testsuite/debug_shared.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin64\"
IntermediateDirectory="obj64\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="2"
CharacterSet="2"
>
<Tool
@ -53,14 +52,14 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
OutputFile="bin64\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin64\${project.target}d.pdb"
SubSystem="2"
SubSystem="1"
TargetMachine="17"
AdditionalOptions="${configuration.linker.additionalOptions}"
/>

5
ProGen/templates/vs120/x64/testsuite/debug_static_md.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin64\static_md\"
IntermediateDirectory="obj64\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="2"
CharacterSet="2"
>
<Tool
@ -53,14 +52,14 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
OutputFile="bin64\static_md\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin64\static_md\${project.target}d.pdb"
SubSystem="2"
SubSystem="1"
TargetMachine="17"
AdditionalOptions="${configuration.linker.additionalOptions}"
/>

6
ProGen/templates/vs120/x64/testsuite/debug_static_mt.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin64\static_mt\"
IntermediateDirectory="obj64\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="1"
CharacterSet="2"
>
<Tool
@ -53,15 +52,14 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
OutputFile="bin64\static_mt\${project.target}d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb"
SubSystem="2"
SubSystem="1"
TargetMachine="17"
AdditionalOptions="${configuration.linker.additionalOptions}"
/>

1
ProGen/templates/vs120/x64/testsuite/project.properties
View File

@ -8,3 +8,4 @@ project.targetSuffix.release_static_mt =
project.postprocess = upgrade2008to2013
project.finalSuffix = _x64_vs120.vcxproj
project.targetArchitecture = AMD64
project.replaceSourceFiles = .\\src\\WinDriver.cpp > .\\src\\Driver.cpp

5
ProGen/templates/vs120/x64/testsuite/release_shared.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin64\"
IntermediateDirectory="obj64\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="2"
CharacterSet="2"
>
<Tool
@ -55,12 +54,12 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
OutputFile="bin64\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
GenerateDebugInformation="false"
SubSystem="2"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"

5
ProGen/templates/vs120/x64/testsuite/release_static_md.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin64\static_md\"
IntermediateDirectory="obj64\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="2"
CharacterSet="2"
>
<Tool
@ -55,12 +54,12 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
OutputFile="bin64\static_md\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
GenerateDebugInformation="false"
SubSystem="2"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"

6
ProGen/templates/vs120/x64/testsuite/release_static_mt.template
View File

@ -3,7 +3,6 @@
OutputDirectory="bin64\static_mt\"
IntermediateDirectory="obj64\$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="1"
CharacterSet="2"
>
<Tool
@ -55,13 +54,12 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
OutputFile="bin64\static_mt\${project.target}.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="${project.pocobase}\lib64"
IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
GenerateDebugInformation="false"
SubSystem="2"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"