Skip to content

Commit

Permalink
Merge pull request pocoproject#10 in FSF_POCO/upstream from ~LUTKOS/u…
Browse files Browse the repository at this point in the history
…pstream:ms-develop to ms-develop

* commit '5db45be1859df9dce0bdc60990d2a6fc86d5d331':
  Fixed project file
  Enabled mp compilation
  • Loading branch information
Kostya Lutsenko authored and Kostya Lutsenko committed Jul 7, 2015
2 parents b84e753 + 5db45be commit 44ec0e0
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 111 deletions.
228 changes: 118 additions & 110 deletions Data/Data_vs120.vcxproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="debug_shared|Win32">
Expand Down Expand Up @@ -32,7 +32,7 @@
<RootNamespace>Data</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
Expand Down Expand Up @@ -63,27 +63,27 @@
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
<ImportGroup Label="ExtensionSettings"/>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros"/>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDatad</TargetName>
Expand Down Expand Up @@ -125,17 +125,18 @@
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<OutputFile>..\bin\PocoDatad.dll</OutputFile>
Expand Down Expand Up @@ -163,9 +164,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/>
<DebugInformationFormat />
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
Expand All @@ -186,18 +187,19 @@
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<ProgramDataBaseFileName>..\lib\PocoDatamtd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<OutputFile>..\lib\PocoDatamtd.lib</OutputFile>
Expand All @@ -218,9 +220,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/>
<DebugInformationFormat />
<CompileAs>Default</CompileAs>
</ClCompile>
<Lib>
Expand All @@ -233,18 +235,19 @@
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<ProgramDataBaseFileName>..\lib\PocoDatamdd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib>
<OutputFile>..\lib\PocoDatamdd.lib</OutputFile>
Expand All @@ -265,104 +268,109 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<ProgramDataBaseFileName>..\lib\PocoDatamd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/>
<DebugInformationFormat />
<CompileAs>Default</CompileAs>
</ClCompile>
<Lib>
<OutputFile>..\lib\PocoDatamd.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="include\Poco\Data\AbstractBinder.h"/>
<ClInclude Include="include\Poco\Data\AbstractBinding.h"/>
<ClInclude Include="include\Poco\Data\AbstractExtraction.h"/>
<ClInclude Include="include\Poco\Data\AbstractExtractor.h"/>
<ClInclude Include="include\Poco\Data\AbstractPreparation.h"/>
<ClInclude Include="include\Poco\Data\AbstractPreparator.h"/>
<ClInclude Include="include\Poco\Data\AbstractSessionImpl.h"/>
<ClInclude Include="include\Poco\Data\ArchiveStrategy.h"/>
<ClInclude Include="include\Poco\Data\AutoTransaction.h"/>
<ClInclude Include="include\Poco\Data\Binding.h"/>
<ClInclude Include="include\Poco\Data\Bulk.h"/>
<ClInclude Include="include\Poco\Data\BulkBinding.h"/>
<ClInclude Include="include\Poco\Data\BulkExtraction.h"/>
<ClInclude Include="include\Poco\Data\Column.h"/>
<ClInclude Include="include\Poco\Data\Connector.h"/>
<ClInclude Include="include\Poco\Data\Constants.h"/>
<ClInclude Include="include\Poco\Data\Data.h"/>
<ClInclude Include="include\Poco\Data\DataException.h"/>
<ClInclude Include="include\Poco\Data\Date.h"/>
<ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
<ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
<ClInclude Include="include\Poco\Data\Extraction.h"/>
<ClInclude Include="include\Poco\Data\Limit.h"/>
<ClInclude Include="include\Poco\Data\LOB.h"/>
<ClInclude Include="include\Poco\Data\LOBStream.h"/>
<ClInclude Include="include\Poco\Data\MetaColumn.h"/>
<ClInclude Include="include\Poco\Data\PooledSessionHolder.h"/>
<ClInclude Include="include\Poco\Data\PooledSessionImpl.h"/>
<ClInclude Include="include\Poco\Data\Position.h"/>
<ClInclude Include="include\Poco\data\Preparation.h"/>
<ClInclude Include="include\Poco\Data\Range.h"/>
<ClInclude Include="include\Poco\Data\RecordSet.h"/>
<ClInclude Include="include\Poco\Data\Row.h"/>
<ClInclude Include="include\Poco\Data\RowFilter.h"/>
<ClInclude Include="include\Poco\Data\RowFormatter.h"/>
<ClInclude Include="include\Poco\Data\RowIterator.h"/>
<ClInclude Include="include\Poco\Data\Session.h"/>
<ClInclude Include="include\Poco\Data\SessionFactory.h"/>
<ClInclude Include="include\Poco\Data\SessionImpl.h"/>
<ClInclude Include="include\Poco\Data\SessionPool.h"/>
<ClInclude Include="include\Poco\Data\SessionPoolContainer.h"/>
<ClInclude Include="include\Poco\Data\SimpleRowFormatter.h"/>
<ClInclude Include="include\Poco\Data\SQLChannel.h"/>
<ClInclude Include="include\Poco\Data\Statement.h"/>
<ClInclude Include="include\Poco\Data\StatementCreator.h"/>
<ClInclude Include="include\Poco\Data\StatementImpl.h"/>
<ClInclude Include="include\Poco\Data\Time.h"/>
<ClInclude Include="include\Poco\Data\Transaction.h"/>
<ClInclude Include="include\Poco\Data\TypeHandler.h"/>
<ClInclude Include="include\Poco\Data\AbstractBinder.h" />
<ClInclude Include="include\Poco\Data\AbstractBinding.h" />
<ClInclude Include="include\Poco\Data\AbstractExtraction.h" />
<ClInclude Include="include\Poco\Data\AbstractExtractor.h" />
<ClInclude Include="include\Poco\Data\AbstractPreparation.h" />
<ClInclude Include="include\Poco\Data\AbstractPreparator.h" />
<ClInclude Include="include\Poco\Data\AbstractSessionImpl.h" />
<ClInclude Include="include\Poco\Data\ArchiveStrategy.h" />
<ClInclude Include="include\Poco\Data\AutoTransaction.h" />
<ClInclude Include="include\Poco\Data\Binding.h" />
<ClInclude Include="include\Poco\Data\Bulk.h" />
<ClInclude Include="include\Poco\Data\BulkBinding.h" />
<ClInclude Include="include\Poco\Data\BulkExtraction.h" />
<ClInclude Include="include\Poco\Data\Column.h" />
<ClInclude Include="include\Poco\Data\Connector.h" />
<ClInclude Include="include\Poco\Data\Constants.h" />
<ClInclude Include="include\Poco\Data\Data.h" />
<ClInclude Include="include\Poco\Data\DataException.h" />
<ClInclude Include="include\Poco\Data\Date.h" />
<ClInclude Include="include\Poco\Data\DynamicDateTime.h" />
<ClInclude Include="include\Poco\Data\DynamicLOB.h" />
<ClInclude Include="include\Poco\Data\Extraction.h" />
<ClInclude Include="include\Poco\Data\Limit.h" />
<ClInclude Include="include\Poco\Data\LOB.h" />
<ClInclude Include="include\Poco\Data\LOBStream.h" />
<ClInclude Include="include\Poco\Data\MetaColumn.h" />
<ClInclude Include="include\Poco\Data\PooledSessionHolder.h" />
<ClInclude Include="include\Poco\Data\PooledSessionImpl.h" />
<ClInclude Include="include\Poco\Data\Position.h" />
<ClInclude Include="include\Poco\data\Preparation.h" />
<ClInclude Include="include\Poco\Data\Range.h" />
<ClInclude Include="include\Poco\Data\RecordSet.h" />
<ClInclude Include="include\Poco\Data\Row.h" />
<ClInclude Include="include\Poco\Data\RowFilter.h" />
<ClInclude Include="include\Poco\Data\RowFormatter.h" />
<ClInclude Include="include\Poco\Data\RowIterator.h" />
<ClInclude Include="include\Poco\Data\Session.h" />
<ClInclude Include="include\Poco\Data\SessionFactory.h" />
<ClInclude Include="include\Poco\Data\SessionImpl.h" />
<ClInclude Include="include\Poco\Data\SessionPool.h" />
<ClInclude Include="include\Poco\Data\SessionPoolContainer.h" />
<ClInclude Include="include\Poco\Data\SimpleRowFormatter.h" />
<ClInclude Include="include\Poco\Data\SQLChannel.h" />
<ClInclude Include="include\Poco\Data\Statement.h" />
<ClInclude Include="include\Poco\Data\StatementCreator.h" />
<ClInclude Include="include\Poco\Data\StatementImpl.h" />
<ClInclude Include="include\Poco\Data\Time.h" />
<ClInclude Include="include\Poco\Data\Transaction.h" />
<ClInclude Include="include\Poco\Data\TypeHandler.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\AbstractBinder.cpp"/>
<ClCompile Include="src\AbstractBinding.cpp"/>
<ClCompile Include="src\AbstractExtraction.cpp"/>
<ClCompile Include="src\AbstractExtractor.cpp"/>
<ClCompile Include="src\AbstractPreparation.cpp"/>
<ClCompile Include="src\AbstractPreparator.cpp"/>
<ClCompile Include="src\ArchiveStrategy.cpp"/>
<ClCompile Include="src\Bulk.cpp"/>
<ClCompile Include="src\Connector.cpp"/>
<ClCompile Include="src\DataException.cpp"/>
<ClCompile Include="src\Date.cpp"/>
<ClCompile Include="src\DynamicLOB.cpp"/>
<ClCompile Include="src\Limit.cpp"/>
<ClCompile Include="src\MetaColumn.cpp"/>
<ClCompile Include="src\PooledSessionHolder.cpp"/>
<ClCompile Include="src\PooledSessionImpl.cpp"/>
<ClCompile Include="src\Position.cpp"/>
<ClCompile Include="src\Range.cpp"/>
<ClCompile Include="src\RecordSet.cpp"/>
<ClCompile Include="src\Row.cpp"/>
<ClCompile Include="src\RowFilter.cpp"/>
<ClCompile Include="src\RowFormatter.cpp"/>
<ClCompile Include="src\RowIterator.cpp"/>
<ClCompile Include="src\Session.cpp"/>
<ClCompile Include="src\SessionFactory.cpp"/>
<ClCompile Include="src\SessionImpl.cpp"/>
<ClCompile Include="src\SessionPool.cpp"/>
<ClCompile Include="src\SessionPoolContainer.cpp"/>
<ClCompile Include="src\SimpleRowFormatter.cpp"/>
<ClCompile Include="src\SQLChannel.cpp"/>
<ClCompile Include="src\Statement.cpp"/>
<ClCompile Include="src\StatementCreator.cpp"/>
<ClCompile Include="src\StatementImpl.cpp"/>
<ClCompile Include="src\Time.cpp"/>
<ClCompile Include="src\Transaction.cpp"/>
<ClCompile Include="src\AbstractBinder.cpp" />
<ClCompile Include="src\AbstractBinding.cpp" />
<ClCompile Include="src\AbstractExtraction.cpp" />
<ClCompile Include="src\AbstractExtractor.cpp" />
<ClCompile Include="src\AbstractPreparation.cpp" />
<ClCompile Include="src\AbstractPreparator.cpp" />
<ClCompile Include="src\ArchiveStrategy.cpp" />
<ClCompile Include="src\Bulk.cpp" />
<ClCompile Include="src\Connector.cpp" />
<ClCompile Include="src\DataException.cpp" />
<ClCompile Include="src\Date.cpp" />
<ClCompile Include="src\DynamicLOB.cpp" />
<ClCompile Include="src\Limit.cpp" />
<ClCompile Include="src\MetaColumn.cpp" />
<ClCompile Include="src\PooledSessionHolder.cpp" />
<ClCompile Include="src\PooledSessionImpl.cpp" />
<ClCompile Include="src\Position.cpp" />
<ClCompile Include="src\Range.cpp" />
<ClCompile Include="src\RecordSet.cpp" />
<ClCompile Include="src\Row.cpp" />
<ClCompile Include="src\RowFilter.cpp" />
<ClCompile Include="src\RowFormatter.cpp" />
<ClCompile Include="src\RowIterator.cpp" />
<ClCompile Include="src\Session.cpp" />
<ClCompile Include="src\SessionFactory.cpp" />
<ClCompile Include="src\SessionImpl.cpp" />
<ClCompile Include="src\SessionPool.cpp" />
<ClCompile Include="src\SessionPoolContainer.cpp" />
<ClCompile Include="src\SimpleRowFormatter.cpp" />
<ClCompile Include="src\SQLChannel.cpp" />
<ClCompile Include="src\Statement.cpp" />
<ClCompile Include="src\StatementCreator.cpp" />
<ClCompile Include="src\StatementImpl.cpp" />
<ClCompile Include="src\Time.cpp" />
<ClCompile Include="src\Transaction.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
<ImportGroup Label="ExtensionTargets"/>
</Project>
<ItemGroup>
<ProjectReference Include="..\Foundation\Foundation_vs120.vcxproj">
<Project>{8164d41d-b053-405b-826c-cf37ac0ef176}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
2 changes: 1 addition & 1 deletion Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
<ClInclude Include="src\ODBCTest.h" />
<ClInclude Include="src\ODBCTestSuite.h" />
<ClInclude Include="src\SQLExecutor.h" />
<ClCompile Include="src\ODBCSybaseTest.h" />
<ClInclude Include="src\ODBCSybaseTest.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\Driver.cpp" />
Expand Down

0 comments on commit 44ec0e0

Please sign in to comment.