- Unified settings of test projects

- Suppressed one more thread-related warning

[SVN r42383]
This commit is contained in:
Andreas Huber 2007-12-31 11:43:15 +00:00
parent 31542e54d7
commit ca6998acac
15 changed files with 37 additions and 32 deletions

View File

@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ALL_DYN_LINK"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -71,7 +71,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/PingPong.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\..\bin.v2\libs\thread\build\msvc-9.0\debug\threading-multi""
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\..\bin.v2\libs\thread\build\msvc-9.0\$(ConfigurationName)\threading-multi";"$(ProjectDir)..\..\..\..\bin.v2\libs\date_time\build\msvc-9.0\$(ConfigurationName)\threading-multi""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/PingPong.pdb"
SubSystem="1"
@ -99,6 +99,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="copy $(ProjectDir)..\..\..\..\bin.v2\libs\thread\build\msvc-9.0\$(ConfigurationName)\threading-multi\*.dll $(TargetDir)&#x0D;&#x0A;copy $(ProjectDir)..\..\..\..\bin.v2\libs\date_time\build\msvc-9.0\$(ConfigurationName)\threading-multi\*.dll $(TargetDir)"
/>
</Configuration>
<Configuration
@ -129,7 +130,7 @@
Optimization="3"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\..\..\.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_ALL_DYN_LINK"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@ -156,7 +157,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)/PingPong.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\..\bin.v2\libs\thread\build\msvc-9.0\release\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\..\bin.v2\libs\thread\build\msvc-9.0\$(ConfigurationName)\threading-multi&quot;;&quot;$(ProjectDir)..\..\..\..\bin.v2\libs\date_time\build\msvc-9.0\$(ConfigurationName)\threading-multi&quot;"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
@ -185,6 +186,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="copy $(ProjectDir)..\..\..\..\bin.v2\libs\thread\build\msvc-9.0\$(ConfigurationName)\threading-multi\*.dll $(TargetDir)&#x0D;&#x0A;copy $(ProjectDir)..\..\..\..\bin.v2\libs\date_time\build\msvc-9.0\$(ConfigurationName)\threading-multi\*.dll $(TargetDir)"
/>
</Configuration>
</Configurations>

View File

@ -22,10 +22,13 @@
# pragma warning( push )
// "conditional expression is constant" in basic_timed_mutex.hpp
# pragma warning( disable: 4127 )
// "Function call with parameters that may be unsafe" in condition_variable.hpp
# pragma warning( disable: 4996 )
// "conversion from 'int' to 'unsigned short'" in microsec_time_clock.hpp
# pragma warning( disable: 4244 )
// "... needs to have dll-interface to be used by clients of class ..."
# pragma warning( disable: 4251 )
// "Function call with parameters that may be unsafe" in
// condition_variable.hpp
# pragma warning( disable: 4996 )
# endif
# include <boost/thread/mutex.hpp>

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/CustomReactionTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/CustomReactionTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/CustomReactionTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/DeferralTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/DeferralTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/DeferralTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/FifoSchedulerTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/FifoSchedulerTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/FifoSchedulerTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/HistoryTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/HistoryTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/HistoryTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/InStateReactionTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/InStateReactionTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/InStateReactionTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/InvalidResultCopyTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/InvalidResultCopyTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/InvalidResultCopyTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/StateCastTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/StateCastTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/StateCastTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/StateIterationTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/StateIterationTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/StateIterationTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/TerminationTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/TerminationTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/TerminationTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/TransitionTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/TransitionTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/TransitionTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/TuTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/TuTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/TuTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/TypeInfoTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/TypeInfoTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/TypeInfoTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

View File

@ -71,7 +71,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_35.lib"
OutputFile="$(OutDir)/UnconsumedResultTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\debug\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/UnconsumedResultTest.pdb"
SubSystem="1"
@ -153,7 +153,7 @@
AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_35.lib"
OutputFile="$(OutDir)/UnconsumedResultTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\release\asynch-exceptions-on\link-static\threading-multi&quot;"
AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"