Skip to content

Commit 883de96

Browse files
aleks-faleks-f
committed
Windows/VS2011 build all configs
1 parent 027dc6d commit 883de96

16 files changed

Lines changed: 486 additions & 559 deletions

File tree

‎CppParser/include/Poco/CppParser/CppParser.h‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,9 @@
7272
//
7373
#if defined(_MSC_VER)
7474
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(CppParser_EXPORTS)
75-
#if defined(POCO_DLL)
76-
#if defined(_DEBUG)
77-
#pragma comment(lib, "PocoCppParserd.lib")
78-
#else
79-
#pragma comment(lib, "PocoCppParser.lib")
80-
#endif
81-
#else
82-
#if defined(_DEBUG)
83-
#pragma comment(lib, "PocoCppParsermtd.lib")
84-
#else
85-
#pragma comment(lib, "PocoCppParsermt.lib")
86-
#endif
87-
#endif
75+
#pragma comment(lib, "PocoCppParser" POCO_LIB_SUFFIX)
8876
#endif
8977
#endif
9078

79+
9180
#endif // CppParser_CppParser_INCLUDED

‎Crypto/testsuite/TestSuite_vs100.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<ClCompile>
116116
<Optimization>Disabled</Optimization>
117117
<AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
118-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119119
<StringPooling>true</StringPooling>
120120
<MinimalRebuild>true</MinimalRebuild>
121121
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -149,7 +149,7 @@
149149
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
150150
<OmitFramePointers>true</OmitFramePointers>
151151
<AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
152-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
152+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
153153
<StringPooling>true</StringPooling>
154154
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
155155
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -177,7 +177,7 @@
177177
<ClCompile>
178178
<Optimization>Disabled</Optimization>
179179
<AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
180-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
180+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
181181
<StringPooling>true</StringPooling>
182182
<MinimalRebuild>true</MinimalRebuild>
183183
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -212,7 +212,7 @@
212212
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
213213
<OmitFramePointers>true</OmitFramePointers>
214214
<AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
215-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
215+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
216216
<StringPooling>true</StringPooling>
217217
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
218218
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -241,7 +241,7 @@
241241
<ClCompile>
242242
<Optimization>Disabled</Optimization>
243243
<AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
244-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
244+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
245245
<StringPooling>true</StringPooling>
246246
<MinimalRebuild>true</MinimalRebuild>
247247
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -275,7 +275,7 @@
275275
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
276276
<OmitFramePointers>true</OmitFramePointers>
277277
<AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
278-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
278+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
279279
<StringPooling>true</StringPooling>
280280
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
281281
<BufferSecurityCheck>false</BufferSecurityCheck>

‎Data/MySQL/include/Poco/Data/MySQL/MySQL.h‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,7 @@
7070
//
7171
#if defined(_MSC_VER)
7272
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(MySQL_EXPORTS)
73-
#if defined(POCO_DLL)
74-
#if defined(_DEBUG)
75-
#pragma comment(lib, "PocoDataMySQLd.lib")
76-
#else
77-
#pragma comment(lib, "PocoDataMySQL.lib")
78-
#endif
79-
#else
80-
#if defined(_DEBUG)
81-
#pragma comment(lib, "PocoDataMySQLmtd.lib")
82-
#else
83-
#pragma comment(lib, "PocoDataMySQLmt.lib")
84-
#endif
85-
#endif
73+
#pragma comment(lib, "PocoDataMySQL" POCO_LIB_SUFFIX)
8674
#endif
8775
#endif
8876

‎Data/ODBC/include/Poco/Data/ODBC/ODBC.h‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,7 @@
7979
//
8080
#if defined(_MSC_VER)
8181
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(ODBC_EXPORTS)
82-
#if defined(POCO_DLL)
83-
#if defined(_DEBUG)
84-
#pragma comment(lib, "PocoDataODBCd.lib")
85-
#else
86-
#pragma comment(lib, "PocoDataODBC.lib")
87-
#endif
88-
#else
89-
#if defined(_DEBUG)
90-
#pragma comment(lib, "PocoDataODBCmtd.lib")
91-
#else
92-
#pragma comment(lib, "PocoDataODBCmt.lib")
93-
#endif
94-
#endif
82+
#pragma comment(lib, "PocoDataODBC" POCO_LIB_SUFFIX)
9583
#endif
9684
#endif
9785

‎Data/SQLite/include/Poco/Data/SQLite/SQLite.h‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,12 @@
6868

6969

7070
//
71-
// Automatically link Data library.
71+
// Automatically link SQLite library.
7272
//
7373
#if defined(_MSC_VER)
7474
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(SQLite_EXPORTS)
75-
#if defined(POCO_DLL)
76-
#if defined(_DEBUG)
77-
#pragma comment(lib, "PocoDataSQLited.lib")
78-
#else
79-
#pragma comment(lib, "PocoDataSQLite.lib")
80-
#endif
81-
#else
82-
#if defined(_DEBUG)
83-
#pragma comment(lib, "PocoDataSQLitemtd.lib")
84-
#else
85-
#pragma comment(lib, "PocoDataSQLitemt.lib")
86-
#endif
87-
#endif
75+
#pragma comment(lib, "PocoDataSQLite" POCO_LIB_SUFFIX)
8876
#endif
8977
#endif
9078

91-
9279
#endif // SQLite_SQLite_INCLUDED

‎Data/include/Poco/Data/Data.h‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,7 @@
7272
//
7373
#if defined(_MSC_VER)
7474
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(Data_EXPORTS)
75-
#if defined(POCO_DLL)
76-
#if defined(_DEBUG)
77-
#pragma comment(lib, "PocoDatad.lib")
78-
#else
79-
#pragma comment(lib, "PocoData.lib")
80-
#endif
81-
#else
82-
#if defined(_DEBUG)
83-
#pragma comment(lib, "PocoDatamtd.lib")
84-
#else
85-
#pragma comment(lib, "PocoDatamt.lib")
86-
#endif
87-
#endif
75+
#pragma comment(lib, "PocoData" POCO_LIB_SUFFIX)
8876
#endif
8977
#endif
9078

‎Data/testsuite/src/DataTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ void DataTest::testRowFormat()
11971197
SimpleRowFormatter rf;
11981198
std::streamsize sz = rf.getColumnWidth();
11991199

1200-
std::string line(sz * 5, '-');
1200+
std::string line(std::string::size_type(sz * 5), '-');
12011201
std::ostringstream os;
12021202
os << std::left << std::setw(sz) << "field0"
12031203
<< std::setw(sz) << "field1"

‎Foundation/Foundation_vs100.vcxproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@
201201
<Lib>
202202
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
203203
<OutputFile>..\lib\PocoFoundationmd.lib</OutputFile>
204+
<AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
204205
</Lib>
205206
</ItemDefinitionGroup>
206207
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -226,6 +227,7 @@
226227
<Lib>
227228
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
228229
<OutputFile>..\lib\PocoFoundationmdd.lib</OutputFile>
230+
<AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
229231
</Lib>
230232
</ItemDefinitionGroup>
231233
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
@@ -251,6 +253,7 @@
251253
<Lib>
252254
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
253255
<OutputFile>..\lib\PocoFoundationmtd.lib</OutputFile>
256+
<AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
254257
</Lib>
255258
</ItemDefinitionGroup>
256259
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -277,6 +280,7 @@
277280
<DebugInformationFormat>
278281
</DebugInformationFormat>
279282
<CompileAs>Default</CompileAs>
283+
<AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
280284
</ClCompile>
281285
<Lib>
282286
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -977,7 +981,7 @@
977981
<ClInclude Include="include\Poco\ByteOrder.h" />
978982
<ClInclude Include="include\Poco\Checksum.h" />
979983
<ClInclude Include="include\Poco\Config.h" />
980-
<ClInclude Include="include\Poco\DirectoryWatcher.h" />
984+
<ClInclude Include="include\Poco\DirectoryWatcher.h" />
981985
<ClInclude Include="include\Poco\Debugger.h" />
982986
<ClInclude Include="include\Poco\DynamicAny.h" />
983987
<ClInclude Include="include\Poco\DynamicAnyHolder.h" />
@@ -1010,6 +1014,7 @@
10101014
<ClInclude Include="include\Poco\Nullable.h" />
10111015
<ClInclude Include="include\Poco\NumberFormatter.h" />
10121016
<ClInclude Include="include\Poco\NumberParser.h" />
1017+
<ClInclude Include="include\Poco\ObjectPool.h" />
10131018
<ClInclude Include="include\Poco\Platform.h" />
10141019
<ClInclude Include="include\Poco\Platform_POSIX.h" />
10151020
<ClInclude Include="include\Poco\Platform_VMS.h" />

‎Foundation/Foundation_vs100.vcxproj.filters‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1787,9 +1787,6 @@
17871787
<ClInclude Include="include\Poco\PriorityStrategy.h">
17881788
<Filter>Events\Header Files</Filter>
17891789
</ClInclude>
1790-
<ClInclude Include="include\Poco\ObjectPool.h">
1791-
<Filter>Core\Header Files</Filter>
1792-
</ClInclude>
17931790
<ClInclude Include="include\Poco\DirectoryWatcher.h">
17941791
<Filter>Filesystem\Header Files</Filter>
17951792
</ClInclude>
@@ -1826,6 +1823,9 @@
18261823
<ClInclude Include="include\Poco\UTFString.h">
18271824
<Filter>Text\Header Files</Filter>
18281825
</ClInclude>
1826+
<ClInclude Include="include\Poco\ObjectPool.h">
1827+
<Filter>Core\Header Files</Filter>
1828+
</ClInclude>
18291829
</ItemGroup>
18301830
<ItemGroup>
18311831
<ResourceCompile Include="src\pocomsg.rc">

‎JSON/include/Poco/JSON/JSON.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
// Automatically link JSON library.
7272
//
7373
#if defined(_MSC_VER)
74-
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(JSON_EXPORTS)
75-
#pragma comment(lib, "PocoJSON" POCO_LIB_SUFFIX)
76-
#endif
74+
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(JSON_EXPORTS)
75+
#pragma comment(lib, "PocoJSON" POCO_LIB_SUFFIX)
76+
#endif
7777
#endif
7878

7979

0 commit comments

Comments
 (0)