diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15bd1015fc..2becdcb213 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -718,3 +718,29 @@ jobs: sudo -s EXCLUDE_TESTS="ActiveRecord ApacheConnector CppParser CppUnit Crypto Data Data/MySQL Data/PostgreSQL Data/SQLite Encodings Foundation JSON JWT MongoDB Net NetSSL_OpenSSL NetSSL_Win PDF PageCompiler PocoDoc ProGen Prometheus Redis SevenZip Util XML Zip" ./ci/runtests.sh + + linux-gcc-make-sqlite-no-sqlparser: + runs-on: ubuntu-22.04 + services: + mysql: + image: mysql:8.1.0 + env: + MYSQL_ALLOW_EMPTY_PASSWORD: yes + MYSQL_USER: pocotest + MYSQL_PASSWORD: pocotest + MYSQL_DATABASE: pocotest + ports: + - 3306:3306 + steps: + - uses: actions/checkout@v3 + - run: sudo apt -y update + - run: ./configure --everything --no-samples --no-sqlparser --omit=ActiveRecord,ApacheConnector,CppParser,Crypto,Data/PostgreSQL,Data/MySQL,Data/ODBC,Encodings,JSON,JWT,MongoDB,Net,NetSSL_OpenSSL,NetSSL_Win,PDF,PageCompiler,PocoDoc,ProGen,Prometheus,Redis,SevenZip,Util,XML,Zip && make all -s -j4 && sudo make install + - uses: ./.github/actions/retry-action + with: + timeout_minutes: 90 + max_attempts: 3 + retry_on: any + command: >- + sudo -s + EXCLUDE_TESTS="ActiveRecord ApacheConnector CppParser CppUnit Crypto Data Data/PostgreSQL Data/ODBC Data/MySQL Encodings Foundation JSON JWT MongoDB Net NetSSL_OpenSSL NetSSL_Win PDF PageCompiler PocoDoc ProGen Prometheus Redis SevenZip Util XML Zip" + ./ci/runtests.sh diff --git a/ActiveRecord/ActiveRecord.progen b/ActiveRecord/ActiveRecord.progen index 3862b7c1a3..e824c80969 100644 --- a/ActiveRecord/ActiveRecord.progen +++ b/ActiveRecord/ActiveRecord.progen @@ -7,7 +7,7 @@ vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\Foundation\\include;..\\Data\\include;..\\Data\\src +vc.project.compiler.include = ..\\Foundation\\include;..\\Data\\include; vc.project.compiler.defines = vc.project.compiler.defines.shared = ${vc.project.name}Lib_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} diff --git a/ActiveRecord/ActiveRecord_vs160.vcxproj b/ActiveRecord/ActiveRecord_vs160.vcxproj index 1ee839cb0f..ef9e1381ca 100644 --- a/ActiveRecord/ActiveRecord_vs160.vcxproj +++ b/ActiveRecord/ActiveRecord_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoActiveRecordd PocoActiveRecordmdd PocoActiveRecordmtd @@ -227,7 +227,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -241,6 +241,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\bin\PocoActiveRecordd.dll @@ -260,7 +262,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -273,6 +275,8 @@ Default true + stdcpp17 + stdc11 ..\bin\PocoActiveRecord.dll @@ -289,7 +293,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -304,6 +308,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoActiveRecordmtd.lib @@ -316,7 +322,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -329,6 +335,8 @@ Default true + stdcpp17 + stdc11 ..\lib\PocoActiveRecordmt.lib @@ -337,7 +345,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -352,6 +360,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoActiveRecordmdd.lib @@ -364,7 +374,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -378,6 +388,8 @@ Default true + stdcpp17 + stdc11 ..\lib\PocoActiveRecordmd.lib @@ -386,7 +398,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -400,6 +412,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\bin64\PocoActiveRecord64d.dll @@ -419,7 +433,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -432,6 +446,8 @@ Default true + stdcpp17 + stdc11 ..\bin64\PocoActiveRecord64.dll @@ -448,7 +464,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -463,6 +479,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoActiveRecordmtd.lib @@ -475,7 +493,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -488,6 +506,8 @@ Default true + stdcpp17 + stdc11 ..\lib64\PocoActiveRecordmt.lib @@ -496,7 +516,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -511,6 +531,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoActiveRecordmdd.lib @@ -523,7 +545,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -536,6 +558,8 @@ Default true + stdcpp17 + stdc11 ..\lib64\PocoActiveRecordmd.lib @@ -552,15 +576,23 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/ActiveRecord/ActiveRecord_vs160.vcxproj.filters b/ActiveRecord/ActiveRecord_vs160.vcxproj.filters index 41f6102fd8..510f26c9b4 100644 --- a/ActiveRecord/ActiveRecord_vs160.vcxproj.filters +++ b/ActiveRecord/ActiveRecord_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {ebe820d0-5937-490c-8ddc-7dde87f658aa} + {21ea7671-1c32-4a3f-b9f7-6170960ef1ac} - {2d5b0e12-b750-4803-ad74-c9756c2abc98} + {0da9c9e9-91ad-4a2d-bc9d-04cb5b7062ae} - {4a459f4f-d116-4642-ad0c-0966c895a8a2} + {fd4fcc95-c1a1-4535-bc22-58f09ebe8669} diff --git a/ActiveRecord/ActiveRecord_vs170.vcxproj b/ActiveRecord/ActiveRecord_vs170.vcxproj index 6637aae271..eb94f51f2f 100644 --- a/ActiveRecord/ActiveRecord_vs170.vcxproj +++ b/ActiveRecord/ActiveRecord_vs170.vcxproj @@ -331,7 +331,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -367,7 +367,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -399,7 +399,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -428,7 +428,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -452,7 +452,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -481,7 +481,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -505,7 +505,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -541,7 +541,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -573,7 +573,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -602,7 +602,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -626,7 +626,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -655,7 +655,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -679,7 +679,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -715,7 +715,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -747,7 +747,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -776,7 +776,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -800,7 +800,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -829,7 +829,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/ActiveRecord/ActiveRecord_vs170.vcxproj.filters b/ActiveRecord/ActiveRecord_vs170.vcxproj.filters index 73cd1f48a3..f7c416d5fb 100644 --- a/ActiveRecord/ActiveRecord_vs170.vcxproj.filters +++ b/ActiveRecord/ActiveRecord_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {2abfaee0-49a0-4b66-9ad7-04a203cfc8cb} + {432c214a-0240-4551-855e-81f76d8d4e8a} - {70b1a521-93e8-4228-ae59-baa5f0e57675} + {1ecf12a7-37ea-4377-af01-5d99e9bb31bb} - {6b444098-e516-439f-aaf8-266510aa8702} + {14c6f1ce-7977-42bb-a83d-deee9c09a926} diff --git a/ActiveRecord/CMakeLists.txt b/ActiveRecord/CMakeLists.txt index ad39171e73..5ba8367629 100644 --- a/ActiveRecord/CMakeLists.txt +++ b/ActiveRecord/CMakeLists.txt @@ -26,7 +26,6 @@ target_include_directories(ActiveRecord PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ) POCO_INSTALL(ActiveRecord) diff --git a/ActiveRecord/Compiler/Compiler_vs160.vcxproj b/ActiveRecord/Compiler/Compiler_vs160.vcxproj index ed4c5cad57..3c52b17e35 100644 --- a/ActiveRecord/Compiler/Compiler_vs160.vcxproj +++ b/ActiveRecord/Compiler/Compiler_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 Compiler {84DD1CB5-4735-478A-B48E-5E4858F0E831} Compiler @@ -157,7 +158,7 @@ - <_ProjectFileVersion>16.0.33423.256 + <_ProjectFileVersion>17.0.34322.80 poco-arcd poco-arcd poco-arcd @@ -248,6 +249,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 bin\poco-arcd.exe @@ -279,6 +282,8 @@ Default true + stdcpp17 + stdc11 bin\poco-arc.exe @@ -307,6 +312,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -339,6 +346,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -368,6 +377,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -400,6 +411,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -429,6 +442,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 bin64\poco-arcd.exe @@ -460,6 +475,8 @@ Default true + stdcpp17 + stdc11 bin64\poco-arc.exe @@ -488,6 +505,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -520,6 +539,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -549,6 +570,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -581,6 +604,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -596,18 +621,28 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/ActiveRecord/Compiler/Compiler_vs160.vcxproj.filters b/ActiveRecord/Compiler/Compiler_vs160.vcxproj.filters index efd4008307..ae3992292b 100644 --- a/ActiveRecord/Compiler/Compiler_vs160.vcxproj.filters +++ b/ActiveRecord/Compiler/Compiler_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {7d3940f9-2bc3-4ee8-9b7f-9be99cfc6fe0} + {29e1ed49-5f12-41fa-94f4-8fe6b3ee5954} - {132066fc-e0fc-494b-9d73-30f03c1b4912} + {ba5400bd-3c95-43bb-8daa-39bff07be443} diff --git a/ActiveRecord/Compiler/Compiler_vs170.vcxproj.filters b/ActiveRecord/Compiler/Compiler_vs170.vcxproj.filters index bda25bf21d..dfac12b356 100644 --- a/ActiveRecord/Compiler/Compiler_vs170.vcxproj.filters +++ b/ActiveRecord/Compiler/Compiler_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {7f2913e1-102b-4ce6-a4b2-f99c8e3a38cd} + {780c9034-0153-453b-8791-d4659eb8554d} - {9edf2033-52b6-4c16-a062-2b35e3cefb3c} + {c0be2d0e-ae4e-4573-9dcf-dc5821858595} diff --git a/ActiveRecord/Makefile b/ActiveRecord/Makefile index 80902c3603..02797b518e 100644 --- a/ActiveRecord/Makefile +++ b/ActiveRecord/Makefile @@ -9,7 +9,7 @@ include $(POCO_BASE)/build/rules/global objects = Context ActiveRecord IDTraits StatementPlaceholderProvider ifndef POCO_DATA_NO_SQL_PARSER - target_includes = $(POCO_BASE)/Data/src + target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src endif target = PocoActiveRecord diff --git a/ActiveRecord/testsuite/TestSuite.progen b/ActiveRecord/testsuite/TestSuite.progen index a13c412438..69af87464e 100644 --- a/ActiveRecord/testsuite/TestSuite.progen +++ b/ActiveRecord/testsuite/TestSuite.progen @@ -6,5 +6,5 @@ vc.project.pocobase = ..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj -vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Data\\include;..\\..\\Data\\src; \ +vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Data\\include; \ ..\\..\\Data\\SQLite\\include;..\\..\\ActiveRecord\\include;.\\include diff --git a/ActiveRecord/testsuite/TestSuite_vs160.vcxproj b/ActiveRecord/testsuite/TestSuite_vs160.vcxproj index 08cacbce79..d87dc9871c 100644 --- a/ActiveRecord/testsuite/TestSuite_vs160.vcxproj +++ b/ActiveRecord/testsuite/TestSuite_vs160.vcxproj @@ -235,7 +235,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj index 7fae305840..baadba6fc5 100644 --- a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj +++ b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -379,7 +379,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -410,7 +410,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -446,7 +446,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -477,7 +477,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -513,7 +513,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -544,7 +544,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -580,7 +580,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -611,7 +611,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -647,7 +647,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -678,7 +678,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -714,7 +714,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -745,7 +745,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -781,7 +781,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -812,7 +812,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -848,7 +848,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -879,7 +879,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -915,7 +915,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/CppParser/CppParser_vs160.vcxproj b/CppParser/CppParser_vs160.vcxproj index 76807cef53..f753b86d25 100644 --- a/CppParser/CppParser_vs160.vcxproj +++ b/CppParser/CppParser_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 CppParser {C77B9D92-EC91-11DA-A4CE-005056C00008} CppParser @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoCppParserd PocoCppParsermdd PocoCppParsermtd @@ -240,6 +241,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\bin\PocoCppParserd.dll @@ -272,6 +275,8 @@ Default true + stdcpp17 + stdc11 ..\bin\PocoCppParser.dll @@ -303,6 +308,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoCppParsermtd.lib @@ -328,6 +335,8 @@ Default true + stdcpp17 + stdc11 ..\lib\PocoCppParsermt.lib @@ -351,6 +360,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoCppParsermdd.lib @@ -377,6 +388,8 @@ Default true + stdcpp17 + stdc11 ..\lib\PocoCppParsermd.lib @@ -399,6 +412,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\bin64\PocoCppParser64d.dll @@ -431,6 +446,8 @@ Default true + stdcpp17 + stdc11 ..\bin64\PocoCppParser64.dll @@ -462,6 +479,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoCppParsermtd.lib @@ -487,6 +506,8 @@ Default true + stdcpp17 + stdc11 ..\lib64\PocoCppParsermt.lib @@ -510,6 +531,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoCppParsermdd.lib @@ -535,6 +558,8 @@ Default true + stdcpp17 + stdc11 ..\lib64\PocoCppParsermd.lib @@ -563,54 +588,88 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/CppParser/CppParser_vs160.vcxproj.filters b/CppParser/CppParser_vs160.vcxproj.filters index 91fb4de8d4..23993cca8f 100644 --- a/CppParser/CppParser_vs160.vcxproj.filters +++ b/CppParser/CppParser_vs160.vcxproj.filters @@ -2,31 +2,31 @@ - {f00d417c-35a7-4c23-ac96-10cb1b6e360b} + {da4186ae-05f3-4abf-9fa2-2386db3876cc} - {2081dcfc-4317-46dd-922b-3da669f141f6} + {4e9b5445-27e0-4fd0-824a-d6355c6724bc} - {11263d64-db92-41af-8537-7bcffd7c48a4} + {b5f7d3f9-a74b-4b59-b455-0d59c6200a98} - {bae4eb2d-e9b4-484f-8e4e-584806b66076} + {eacfeb40-f333-426c-a5a5-c9ab85d209ea} - {e2fe452f-bb77-4c66-935f-b986e86a2c16} + {f3023194-357d-4e15-a227-3099ba997037} - {8f17481b-d798-4186-afd7-9f7e862d9b90} + {a1919762-b8ac-4d28-903d-511854a1a7b1} - {4e9a5cac-8f55-4bfa-a56e-44c33051691d} + {9106be0a-6821-40f4-b460-437e72cbadfe} - {b0800513-9635-4560-891a-ad916ebbe18d} + {906e5fe8-c28f-4c31-9dee-f3f9bcbcde35} - {dd4d9b6c-d070-462f-8408-9a7b3a8c93d3} + {0f617a7a-cf68-4dbd-8de3-7a89a99756e5} diff --git a/CppParser/CppParser_vs170.vcxproj.filters b/CppParser/CppParser_vs170.vcxproj.filters index cd9562122f..dad5daabb2 100644 --- a/CppParser/CppParser_vs170.vcxproj.filters +++ b/CppParser/CppParser_vs170.vcxproj.filters @@ -2,31 +2,31 @@ - {22a4c008-4a23-452a-a12a-0f6595ae1200} + {04fc4f1d-2274-4331-b73a-983236125a2f} - {2e3628cf-e59b-487e-97d3-46b28b5da8bb} + {48da727d-3925-4adb-8128-8e371873b418} - {0ecc68a2-22c2-49af-a1fa-5a79c770e52c} + {5f42528e-6e34-4c9d-98f4-c561a87e3b98} - {975cd316-19e5-4786-aef8-112ead31879b} + {72e542a3-5ed5-4549-a8f0-84b07832a5d8} - {7f74c210-2a9e-45b7-9fb1-748934d57b22} + {5a1e3cc6-6a35-4b0f-b6d1-987a4516b114} - {f605c7cb-1238-4ceb-a104-d0d0e63dd7b3} + {abed0e17-015a-49f0-acdf-9c68f3a5f7ea} - {315aef06-cd6e-4d01-8d73-5e1dbff488fd} + {206c3f3b-04d2-4444-ab00-5a291ae2500d} - {f5c52f93-e8ca-4de7-b0ce-c7fb7a0ad50f} + {703de990-b5f5-404b-beaa-82c6f1cf3b03} - {2bf7e8a4-f378-436f-b321-4b7ec8b9fe1d} + {a3ca1499-f56c-41b3-bb6d-962492907f62} diff --git a/CppParser/testsuite/src/CppParserTest.cpp b/CppParser/testsuite/src/CppParserTest.cpp index b200ca1454..c63f4c60a8 100644 --- a/CppParser/testsuite/src/CppParserTest.cpp +++ b/CppParser/testsuite/src/CppParserTest.cpp @@ -33,7 +33,7 @@ std::string options("/I \"C:\\Program Files\\Microsoft Visual Studio 8\\VC\\INCL "/D \"_WINDOWS\", " "/D \"_MBCS\", " "/C, /P, /TP"); -std::string path("C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\IDE;C:\\Program Files\\Microsoft Visual Studio 8\\VC\\BIN;C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools;;C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools\\bin"); +std::string path("C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\IDE;C:\\Program Files\\Microsoft Visual Studio 8\\VC\\BIN;C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools;C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools\\bin"); CppParserTest::CppParserTest(const std::string& name): CppUnit::TestCase(name) diff --git a/CppUnit/CppUnit_vs160.vcxproj b/CppUnit/CppUnit_vs160.vcxproj index 7eeafbc10c..be3b587e56 100644 --- a/CppUnit/CppUnit_vs160.vcxproj +++ b/CppUnit/CppUnit_vs160.vcxproj @@ -1,5 +1,5 @@ - - + + debug_shared @@ -51,12 +51,13 @@ + 17.0 CppUnit {138BB448-808A-4FE5-A66D-78D1F8770F59} CppUnit Win32Proj - + StaticLibrary MultiByte @@ -117,47 +118,47 @@ MultiByte v142 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 CppUnitd CppUnitmdd CppUnitmtd @@ -235,11 +236,13 @@ true true true - + Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\bin\CppUnitd.dll @@ -267,11 +270,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 ..\bin\CppUnit.dll @@ -297,12 +302,14 @@ true true true - + ..\lib\CppUnitmtd.pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\CppUnitmtd.lib @@ -323,11 +330,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 ..\lib\CppUnitmt.lib @@ -345,12 +354,14 @@ true true true - + ..\lib\CppUnitmdd.pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\CppUnitmdd.lib @@ -371,12 +382,14 @@ true true true - + ..\lib\CppUnitmd.pdb Level3 - + Default true + stdcpp17 + stdc11 ..\lib\CppUnitmd.lib @@ -394,11 +407,13 @@ true true true - + Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\bin64\CppUnit64d.dll @@ -426,11 +441,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 ..\bin64\CppUnit64.dll @@ -456,12 +473,14 @@ true true true - + ..\lib64\CppUnitmtd.pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\CppUnitmtd.lib @@ -482,11 +501,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 ..\lib64\CppUnitmt.lib @@ -504,12 +525,14 @@ true true true - + ..\lib64\CppUnitmdd.pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\CppUnitmdd.lib @@ -530,11 +553,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 ..\lib64\CppUnitmd.lib @@ -543,47 +568,63 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/CppUnit/CppUnit_vs160.vcxproj.filters b/CppUnit/CppUnit_vs160.vcxproj.filters index 008efd977d..42f46648b3 100644 --- a/CppUnit/CppUnit_vs160.vcxproj.filters +++ b/CppUnit/CppUnit_vs160.vcxproj.filters @@ -2,11 +2,11 @@ - {3abf74aa-bef5-4a86-8520-bb9054dcd773} + {963448fa-022d-4c44-9361-96ba38e785ba} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {438273e9-4ad5-423c-a179-b6d52bc048d0} + {c9d5e2ec-2012-46bb-b312-d85c687d338a} *.h diff --git a/CppUnit/CppUnit_vs170.vcxproj.filters b/CppUnit/CppUnit_vs170.vcxproj.filters index f6e5b32f1f..f8d4549ecf 100644 --- a/CppUnit/CppUnit_vs170.vcxproj.filters +++ b/CppUnit/CppUnit_vs170.vcxproj.filters @@ -2,11 +2,11 @@ - {c81826ae-391d-40d2-ad57-7d8ed59ba862} + {7b3be91a-acf5-44e5-a39b-e503d6ed15c1} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {6baa3333-3a56-45c4-a3a4-6774d2121132} + {d207b5fb-1df4-4147-a39c-38e5ca4cf7d1} *.h diff --git a/CppUnit/Makefile b/CppUnit/Makefile index 4890fe6674..00c277e465 100644 --- a/CppUnit/Makefile +++ b/CppUnit/Makefile @@ -11,6 +11,5 @@ objects = CppUnitException TestDecorator TestResult TestSuite \ target = CppUnit target_version = 1 -target_libs = PocoFoundation include $(POCO_BASE)/build/rules/lib diff --git a/CppUnit/cmake/CppUnitConfig.cmake b/CppUnit/cmake/CppUnitConfig.cmake deleted file mode 100644 index f78f247b08..0000000000 --- a/CppUnit/cmake/CppUnitConfig.cmake +++ /dev/null @@ -1,3 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(PocoFoundation) -include("${CMAKE_CURRENT_LIST_DIR}/PocoDataTargets.cmake") diff --git a/CppUnit/dependencies b/CppUnit/dependencies deleted file mode 100644 index 2e8175e4e1..0000000000 --- a/CppUnit/dependencies +++ /dev/null @@ -1 +0,0 @@ -Foundation diff --git a/Crypto/Crypto_vs160.vcxproj b/Crypto/Crypto_vs160.vcxproj index 833edebbb9..60d002781b 100644 --- a/Crypto/Crypto_vs160.vcxproj +++ b/Crypto/Crypto_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 Crypto {EEEE7259-32E9-4D56-B023-C733940AB2A0} Crypto @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoCryptod PocoCryptomdd PocoCryptomtd @@ -240,6 +241,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -273,6 +276,8 @@ Default true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -305,6 +310,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoCryptomtd.lib @@ -330,6 +337,8 @@ Default true + stdcpp17 + stdc11 ..\lib\PocoCryptomt.lib @@ -353,6 +362,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoCryptomdd.lib @@ -379,6 +390,8 @@ Default true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -402,6 +415,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -435,6 +450,8 @@ Default true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -467,6 +484,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoCryptomtd.lib @@ -492,6 +511,8 @@ Default true + stdcpp17 + stdc11 ..\lib64\PocoCryptomt.lib @@ -515,6 +536,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoCryptomdd.lib @@ -540,6 +563,8 @@ Default true + stdcpp17 + stdc11 ..\lib64\PocoCryptomd.lib @@ -575,75 +600,123 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Crypto/Crypto_vs160.vcxproj.filters b/Crypto/Crypto_vs160.vcxproj.filters index f504013875..67f495c53e 100644 --- a/Crypto/Crypto_vs160.vcxproj.filters +++ b/Crypto/Crypto_vs160.vcxproj.filters @@ -2,58 +2,58 @@ - {3e947499-e07e-49ae-9368-67ebdce7e2d9} + {7e010cae-f020-472a-9415-8e2543ef6627} - {56cd8b79-7799-4706-be30-2f2551da9b06} + {05818654-8d93-468d-8d69-b11c10c0b9ef} - {ba015481-3cdc-4b4e-979f-73af16c9f113} + {19e6289b-8a3c-44f3-ae04-d62f6f3f1b5c} - {29330975-8f63-4932-ae8b-2fc823bb5729} + {ce38da17-a330-495e-9f3e-1b13265936e2} - {0de2d2fa-d52e-4b93-8429-1cc40ac5d89c} + {5822cad2-ab82-412d-abf8-6a3d01487a69} - {73da9949-c7b1-450e-bfca-78e4fbaf01d0} + {7cb7227e-5207-4603-8e22-7bfabcb92419} - {56b61611-cae5-4a96-bec3-89dce21181c0} + {3fe6235b-ca65-4006-bd43-af0ec04bd7f1} - {7c16cc60-1306-47e1-aebf-18a33bbc40d3} + {2918c4ac-4fed-4cf6-b543-ffc4dcfa4b82} - {15ccacc4-e673-4461-979f-862c147d2d0b} + {9e75a9b3-e8d3-48e8-ba2f-58d7bd2a6a9d} - {26ce3381-5dc3-4241-8d27-09e14c4043b6} + {4824d8a4-40bf-4a78-86db-73b06e2deb5e} - {9c578c8e-c65f-4088-9ca6-7609d2e7ebc0} + {07188323-9cd6-44c4-86df-adaa06f7056b} - {418ebbbe-2a7d-4015-adf8-2e86566935a2} + {7c066cff-b417-440f-a723-d0f884234e31} - {0a5aa58f-8179-480c-8805-7b64cb7c282a} + {4131f2ad-b79f-468f-829c-cc6e694b9b09} - {66cbfe0e-ff30-42fe-9736-9fe8afad9463} + {67dfe23d-8945-4c6b-bc99-5c26d1c9e9fb} - {5ef84937-9e64-4f4a-af40-1118ac399fdc} + {96be4aeb-3299-4fb1-a7dd-d788584523b4} - {59903614-4362-40ca-90f9-61958a40bf02} + {6102403a-212b-497e-a639-ad4bbc94103d} - {6f907377-ea23-41d7-8008-63bf458c1a99} + {7f4dc99b-5489-41b5-bc75-5f720932de65} - {e724e3f7-8adc-4738-8be3-fb6edbd76351} + {49649e1a-09cf-45d1-92a9-a3aa6abe43b4} diff --git a/Crypto/Crypto_vs170.vcxproj.filters b/Crypto/Crypto_vs170.vcxproj.filters index 8dd1646392..f19c718f4a 100644 --- a/Crypto/Crypto_vs170.vcxproj.filters +++ b/Crypto/Crypto_vs170.vcxproj.filters @@ -2,58 +2,58 @@ - {e4c49a27-04d0-4ddc-8795-f17c70e2b7e7} + {3aae1caa-ecff-4053-a81d-977e521e5c87} - {c152364e-4636-4536-9d1f-ceb02dffa264} + {7510a388-fc23-42a7-a7c2-2a3d242c4211} - {9510091e-4f8d-499b-92a6-be553d45316b} + {50900110-d23e-4374-90fd-36e48e4dad99} - {fbfd0876-4670-4def-a529-7cf8923c2961} + {9c32ff7b-5d5d-46a5-922a-5f128ea342dd} - {5b21093d-d3b4-4291-b47f-ece9f024ddd8} + {4fa8cb3b-5503-4f61-acb1-57a11d94e1c5} - {d9423ed6-d9b6-4ecb-b6b8-9322d6c3f995} + {a71b5463-8361-4c0e-bd16-fbfbd4921d2b} - {129cbfa3-8e47-4cdd-a614-6df3e4fb0408} + {6bf61ee7-c315-4e69-a6ab-bfe72f4c1c4c} - {572de956-2613-47de-9629-80a415067e58} + {0b2114f5-7795-4ede-b999-bf08d948e997} - {4b330ecf-7831-4b3f-8e7b-f3b028ba97b0} + {20af4346-6482-44f6-b813-ac75a0ed1820} - {b213e21e-b970-4e41-897f-af8f064c1926} + {2f05d665-ed8c-4bda-b51e-a4c53c266f4e} - {912e16ae-3f1e-4087-8ada-0b1a7d45f6c4} + {d0dac58b-8d74-47b3-80bc-f53c4f42648d} - {dddf49b9-d285-46ad-9aed-0bd977e67caf} + {09b4b347-f640-43f1-a5d8-a6b994207d6f} - {1eb34481-278c-49c3-a4e8-6e6733e0a06d} + {50c81c4e-471d-4104-a199-1b31e2f32df2} - {b181d31d-7aa8-4436-9353-a420cca61fbf} + {317f8dd4-bb89-4cf3-8128-3ff84add12e2} - {12de2d74-9477-43ae-b3d8-4a94001b6eb1} + {f2c312ee-ce71-4529-b3d8-a180bfa87baa} - {c0df7136-ad12-4fdc-bda1-73a46c627a4c} + {d67ab044-b6f3-4600-a233-0f78eb68f451} - {b6cdd172-33a7-448b-85e5-c9982b77c53e} + {149a748e-cdab-4694-ae93-cc8d0f7b6cf0} - {384218a8-372e-47a7-b7f2-2ce7f7be1860} + {27a7c180-9724-416f-a98f-c7ba2fc44b38} diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt index d795073c38..87f0ee58af 100644 --- a/Data/CMakeLists.txt +++ b/Data/CMakeLists.txt @@ -2,8 +2,8 @@ file(GLOB SRCS_G "src/*.cpp") POCO_SOURCES_AUTO(SRCS ${SRCS_G}) if (NOT POCO_DATA_NO_SQL_PARSER) - file(GLOB_RECURSE SRCS_PARSER "src/sql-parser/src/*.cpp") - LIST(REMOVE_ITEM SRCS_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/src/sql-parser/src/parser/conflict_test.cpp") + file(GLOB_RECURSE SRCS_PARSER "SQLParser/src/*.cpp") + LIST(REMOVE_ITEM SRCS_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/SQLParser/src/parser/conflict_test.cpp") POCO_SOURCES_AUTO(SRCS ${SRCS_PARSER}) endif() @@ -38,13 +38,24 @@ if (NOT POCO_DATA_NO_SQL_PARSER) target_compile_definitions(Data PUBLIC -DSQLParser_EXPORTS) endif() target_link_libraries(Data PUBLIC Poco::Foundation) -target_include_directories(Data + +if(NOT POCO_DATA_NO_SQL_PARSER) + target_include_directories(Data + PUBLIC + $ + $ + $ + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/SQLParser/src + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/SQLParser + ) +else() + target_include_directories(Data PUBLIC $ $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src -) + ) +endif() POCO_INSTALL(Data) POCO_GENERATE_PACKAGE(Data) diff --git a/Data/Data.progen b/Data/Data.progen index 353b1af137..2333d1f8cb 100644 --- a/Data/Data.progen +++ b/Data/Data.progen @@ -8,10 +8,7 @@ vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -# TODO, for now we can just send cpp std via AdditionalOptions (see below) -#vc.project.compiler.std.cpp=stdcpp17 -#vc.project.compiler.std.c=stdc11 -vc.project.compiler.include = .\\src;..\\Foundation\\include +vc.project.compiler.include = .\\SQLParser;.\\SQLParser\\src;..\\Foundation\\include vc.project.compiler.defines = vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS;SQLParser_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} diff --git a/Data/Data_VS90.vcproj b/Data/Data_VS90.vcproj index 7ee4df50e8..233d67d0a8 100644 --- a/Data/Data_VS90.vcproj +++ b/Data/Data_VS90.vcproj @@ -872,15 +872,15 @@ Name="Header Files" > @@ -888,11 +888,11 @@ Name="Source Files" > @@ -903,15 +903,15 @@ Name="Header Files" > @@ -919,11 +919,11 @@ Name="Source Files" > @@ -935,75 +935,75 @@ Name="Header Files" > @@ -1011,23 +1011,23 @@ Name="Source Files" > @@ -1039,7 +1039,7 @@ Name="Header Files" > @@ -1047,7 +1047,7 @@ Name="Source Files" > diff --git a/Data/Data_vs160.vcxproj b/Data/Data_vs160.vcxproj index 276468518e..54f12edf7a 100644 --- a/Data/Data_vs160.vcxproj +++ b/Data/Data_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDatad PocoDatamdd PocoDatamtd @@ -227,7 +227,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -240,8 +240,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoDatad.dll @@ -261,7 +263,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -273,8 +275,10 @@ Level3 Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoData.dll @@ -291,7 +295,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -305,8 +309,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoDatamtd.lib @@ -319,7 +325,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -331,8 +337,10 @@ Level3 Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoDatamt.lib @@ -341,7 +349,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -355,8 +363,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoDatamdd.lib @@ -369,7 +379,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -382,8 +392,10 @@ Level3 Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoDatamd.lib @@ -392,7 +404,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -405,8 +417,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoData64d.dll @@ -426,7 +440,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -438,8 +452,10 @@ Level3 Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoData64.dll @@ -456,7 +472,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -470,8 +486,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoDatamtd.lib @@ -484,7 +502,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -496,8 +514,10 @@ Level3 Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoDatamt.lib @@ -506,7 +526,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -520,8 +540,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoDatamdd.lib @@ -534,7 +556,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -546,8 +568,10 @@ Level3 Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoDatamd.lib @@ -606,173 +630,267 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Data/Data_vs160.vcxproj.filters b/Data/Data_vs160.vcxproj.filters index 16ff216404..db6cccf15c 100644 --- a/Data/Data_vs160.vcxproj.filters +++ b/Data/Data_vs160.vcxproj.filters @@ -2,67 +2,67 @@ - {288b7ac9-80e7-4977-a381-cadf008ebcdf} + {f67496db-5e4d-4de1-8a40-22d8a971e70f} - {12c9cc3b-7826-4d45-92e1-dfaf991fa840} + {37d63788-6e99-4bc2-ac7d-df3d21fdeb84} - {9b0e3fe8-e8ce-4391-9560-884f347aa865} + {cab3a63a-af79-4ada-ab81-6a4053f3a571} - {2e63a473-b289-4e92-92cc-e16be11c82d2} + {6f73da86-3251-4ad2-832e-8e00591dbdf0} - {18ea13a6-df50-4dc9-a7fe-926a890660ae} + {464c1180-2454-428e-bc2c-8ff90408a770} - {66c345c5-e7e4-4f9f-b52f-7413988b0d27} + {22e18c41-d9e4-480d-b23b-35c27bccce72} - {0c5d9d8e-0633-457a-91ed-1c3aeea54844} + {5dd49dbc-28da-4f15-86ad-8a6ae9024d27} - {9adf59bc-ea95-4087-bc16-555f8005d8b5} + {85cd8433-468c-4307-9688-26de2fd333d5} - {fe968685-92e8-4ee7-b34c-3b0d38738b4d} + {83340844-8264-4418-873b-72233686c996} - {e19f63d7-be47-4527-b461-2fad09893743} + {5ff3ad8a-0759-40ef-9b8b-77e8257986ff} - {53b9df29-8e80-48a8-820d-1090106ca8b7} + {ee380eb8-ed0b-4479-a464-0ae71875e979} - {400e13b9-2f0b-47d7-9cef-98085da073bb} + {6357bcb3-22ce-4257-911d-026fa251d22b} - {5b82d281-dcdc-4347-b738-349ae56de5ed} + {77a5e5cf-089a-4e1f-ba28-1b7435afc70d} - {a4f1e56c-3574-4ab4-a763-a2ecdb55085a} + {68edda08-bb81-4420-bc73-7d1d7ed4aedb} - {bd87f7db-3601-4147-9364-b8f2a7405480} + {14d3b337-a039-4384-996d-832688c38750} - {d71eb285-47d3-47af-97a9-eedcdc0a8293} + {fb2d5165-8bce-4130-9875-76d78fbe6077} - {de71c098-5b96-428d-b141-1c732e265a84} + {117a3df6-f433-4bfb-9d06-91c2eef96d17} - {f726cbf2-abf6-4b07-9db2-c68d87d7f66d} + {c9eddd0e-0d4a-43b8-8d64-ac42a5071b75} - {04cbb57c-8da3-490b-b7b9-08fc95bb8b1f} + {fffffe76-6e5a-4c56-8490-7b6572aeb408} - {de7a4819-b822-4c31-9668-ba871e59ba73} + {575753d6-b376-4dc1-ab7a-08f2194ff1a1} - {a983f5f7-627c-43e2-ad22-62bdc4eade93} + {92c18071-c3bf-4f6d-90fd-69cfd09579a5} @@ -219,79 +219,79 @@ SessionPooling\Header Files - + SQLParser\Header Files - + SQLParser\Header Files - + SQLParser\Header Files - + SQLParser\parser\Header Files - + SQLParser\parser\Header Files - + SQLParser\parser\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\util\Header Files @@ -407,34 +407,34 @@ SessionPooling\Source Files - + SQLParser\Source Files - + SQLParser\Source Files - + SQLParser\parser\Source Files - + SQLParser\parser\Source Files - + SQLParser\sql\Source Files - + SQLParser\sql\Source Files - + SQLParser\sql\Source Files - + SQLParser\sql\Source Files - + SQLParser\sql\Source Files - + SQLParser\util\Source Files diff --git a/Data/Data_vs170.vcxproj b/Data/Data_vs170.vcxproj index 9f5a2d8882..0cc1814d65 100644 --- a/Data/Data_vs170.vcxproj +++ b/Data/Data_vs170.vcxproj @@ -331,7 +331,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -368,7 +368,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -401,7 +401,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -431,7 +431,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -456,7 +456,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -486,7 +486,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -511,7 +511,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -548,7 +548,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -581,7 +581,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -611,7 +611,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -636,7 +636,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -666,7 +666,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -691,7 +691,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -728,7 +728,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -761,7 +761,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -791,7 +791,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -816,7 +816,7 @@ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -846,7 +846,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\SQLParser;.\SQLParser\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -921,229 +921,229 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 diff --git a/Data/Data_vs170.vcxproj.filters b/Data/Data_vs170.vcxproj.filters index 274357ea59..b49c64254d 100644 --- a/Data/Data_vs170.vcxproj.filters +++ b/Data/Data_vs170.vcxproj.filters @@ -2,67 +2,67 @@ - {ed293173-38e4-456c-8b1b-fbb4edb534a2} + {c111f2b8-0fe5-45cf-bcf5-6717f913f4d1} - {09512048-b662-4412-9d66-9278f5127b64} + {a429278e-282a-48ad-a6e9-4673ad994ef6} - {e5a0ae46-4dcb-44ee-ad87-6c29296fdb75} + {34cb5ff3-8959-4b44-b06a-6a371e903043} - {3ab0b097-7c41-423d-a520-9955c13afd07} + {56b9dadb-359a-44e8-af9d-67dd5d8cadd2} - {fb8ac504-99e9-4c9f-acf9-cd7e199ccbb8} + {d775c737-421f-45a3-ba6e-a47034ca0c93} - {96d47a24-bbc7-4503-98f1-722cb7e6c525} + {c282924f-b59d-4fee-b202-c6c567572666} - {722167c1-e2c8-4893-bf49-f06a56e4475a} + {fcca3d29-3bf5-47f1-be8a-2fe1a0773a9e} - {0fd0e46c-2c11-4305-bf67-4e39819f3600} + {ce5fcae6-0135-4453-9d16-acf8ce133fff} - {52fb64cd-2a53-461c-8056-ee3178aac103} + {51152c9c-3e67-47f2-965d-4f8b5528df0f} - {7ba52d24-1fb2-465f-8937-71c5f1c2aeef} + {6886ee17-8a9c-4cf4-820f-cd96ed915c74} - {8d74d8c7-dae7-4a18-858f-09bcf7f09f1b} + {4c76e1c2-dbd6-4090-9c9f-d09fcc8521c4} - {8f9442dc-d276-42ed-829a-3112f876419b} + {85d4c9a3-827b-450b-a4f0-56db8cf5da12} - {57e26b75-95c1-4d32-8239-7a303d573048} + {903ed189-9ddf-44c6-b600-ea212371ea3c} - {f7ab1f90-c32d-4108-9cba-3a380c12af48} + {b2f5f062-3106-4301-8e49-7b242ae66efe} - {70937b86-7f9e-42eb-a1cb-532959b076b3} + {2dda7dbb-8a31-4869-87d3-374c7effd007} - {426b95e7-0f6b-4a2e-8227-5d1f2a96c38b} + {574a99ce-a7ea-4221-bdcb-318456d50f0e} - {59e3d7d8-f310-4e86-a84e-9e5648e238f8} + {e07a89d7-c43c-425f-8bb0-eec2ef4c5763} - {8b87b125-d1e5-4037-85fa-2edd7d77e940} + {c9455486-7d6c-4732-a11f-513a24cb954e} - {307ff9fb-35fa-4c93-a388-e4072672006d} + {6d03dc65-89e5-4dac-a6be-0ad2e761adc1} - {7137d8b1-eeb5-4fee-b080-d7c87dc42a43} + {2fc9ede0-fc29-4e59-ba50-a587575c2cc2} - {55caa527-40a5-4ee1-a9f2-58b13550166f} + {b5c53c80-25ce-4a87-8634-2808040e62ab} @@ -219,79 +219,79 @@ SessionPooling\Header Files - + SQLParser\Header Files - + SQLParser\Header Files - + SQLParser\Header Files - + SQLParser\parser\Header Files - + SQLParser\parser\Header Files - + SQLParser\parser\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\sql\Header Files - + SQLParser\util\Header Files @@ -407,34 +407,34 @@ SessionPooling\Source Files - + SQLParser\Source Files - + SQLParser\Source Files - + SQLParser\parser\Source Files - + SQLParser\parser\Source Files - + SQLParser\sql\Source Files - + SQLParser\sql\Source Files - + SQLParser\sql\Source Files - + SQLParser\sql\Source Files - + SQLParser\sql\Source Files - + SQLParser\util\Source Files diff --git a/Data/Makefile b/Data/Makefile index ba47e0276e..a01ca61e2d 100644 --- a/Data/Makefile +++ b/Data/Makefile @@ -20,7 +20,7 @@ ifndef POCO_DATA_NO_SQL_PARSER bison_parser flex_lexer \ CreateStatement PrepareStatement SQLStatement \ Expr statements sqlhelper - target_includes = $(POCO_BASE)/Data/src + target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src endif target = PocoData diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt index ce411cfea3..0ea8701a85 100644 --- a/Data/MySQL/CMakeLists.txt +++ b/Data/MySQL/CMakeLists.txt @@ -26,7 +26,6 @@ target_include_directories(DataMySQL PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ) target_compile_definitions(DataMySQL PUBLIC THREADSAFE NO_TCL) diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile index b199db03cd..915f387b74 100644 --- a/Data/MySQL/Makefile +++ b/Data/MySQL/Makefile @@ -15,10 +15,6 @@ objects = Binder Extractor SessionImpl Connector \ MySQLStatementImpl ResultMetadata MySQLException \ SessionHandle StatementExecutor Utility -ifndef POCO_DATA_NO_SQL_PARSER - target_includes = $(POCO_BASE)/Data/src -endif - target = PocoDataMySQL target_version = $(LIBVERSION) target_libs = PocoData PocoFoundation diff --git a/Data/MySQL/MySQL.progen b/Data/MySQL/MySQL.progen index 278d9fef7c..1eea490ae4 100644 --- a/Data/MySQL/MySQL.progen +++ b/Data/MySQL/MySQL.progen @@ -8,7 +8,7 @@ vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.compiler.include = ${vc.project.pocobase}\\Foundation\\include; \ - ${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\Data\\src;${vc.project.pocobase}\\mysql\\include + ${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\mysql\\include vc.project.compiler.defines = THREADSAFE;__LCC__ vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} diff --git a/Data/MySQL/MySQL_VS90.vcproj b/Data/MySQL/MySQL_VS90.vcproj index 5399c652dc..75e5dc140c 100644 --- a/Data/MySQL/MySQL_VS90.vcproj +++ b/Data/MySQL/MySQL_VS90.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS" StringPooling="true" MinimalRebuild="true" @@ -136,7 +136,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS" StringPooling="true" RuntimeLibrary="2" @@ -224,7 +224,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__" StringPooling="true" MinimalRebuild="true" @@ -302,7 +302,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__" StringPooling="true" RuntimeLibrary="0" @@ -373,7 +373,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__" StringPooling="true" MinimalRebuild="true" @@ -451,7 +451,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__" StringPooling="true" RuntimeLibrary="2" diff --git a/Data/MySQL/MySQL_vs160.vcxproj b/Data/MySQL/MySQL_vs160.vcxproj index a316b49410..13cd86d038 100644 --- a/Data/MySQL/MySQL_vs160.vcxproj +++ b/Data/MySQL/MySQL_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDataMySQLd PocoDataMySQLmdd PocoDataMySQLmtd @@ -227,7 +227,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -241,6 +241,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\bin\PocoDataMySQLd.dll @@ -260,7 +262,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -273,6 +275,8 @@ Default true + stdcpp17 + stdc11 ..\..\bin\PocoDataMySQL.dll @@ -289,7 +293,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -304,6 +308,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataMySQLmtd.lib @@ -316,7 +322,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreaded @@ -329,6 +335,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataMySQLmt.lib @@ -337,7 +345,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -352,6 +360,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataMySQLmdd.lib @@ -364,7 +374,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -378,6 +388,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataMySQLmd.lib @@ -386,7 +398,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -400,6 +412,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\bin64\PocoDataMySQL64d.dll @@ -419,7 +433,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -432,6 +446,8 @@ Default true + stdcpp17 + stdc11 ..\..\bin64\PocoDataMySQL64.dll @@ -448,7 +464,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -463,6 +479,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataMySQLmtd.lib @@ -475,7 +493,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreaded @@ -488,6 +506,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataMySQLmt.lib @@ -496,7 +516,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -511,6 +531,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataMySQLmdd.lib @@ -523,7 +545,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -536,6 +558,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataMySQLmd.lib @@ -544,33 +568,53 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Data/MySQL/MySQL_vs170.vcxproj b/Data/MySQL/MySQL_vs170.vcxproj index 146c919629..8bd706e34d 100644 --- a/Data/MySQL/MySQL_vs170.vcxproj +++ b/Data/MySQL/MySQL_vs170.vcxproj @@ -331,7 +331,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -367,7 +367,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -399,7 +399,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -428,7 +428,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreaded @@ -452,7 +452,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -481,7 +481,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -505,7 +505,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -541,7 +541,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -573,7 +573,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -602,7 +602,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreaded @@ -626,7 +626,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -655,7 +655,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -679,7 +679,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -715,7 +715,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -747,7 +747,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -776,7 +776,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreaded @@ -800,7 +800,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -829,7 +829,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/MySQL/testsuite/Makefile b/Data/MySQL/testsuite/Makefile index a8c59defc2..f07a043289 100644 --- a/Data/MySQL/testsuite/Makefile +++ b/Data/MySQL/testsuite/Makefile @@ -14,7 +14,7 @@ SYSLIBS += -lmysqlclient -lz -lpthread -ldl objects = MySQLTestSuite Driver MySQLTest SQLExecutor ifndef POCO_DATA_NO_SQL_PARSER - target_includes = $(POCO_BASE)/Data/src + target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src endif target = testrunner diff --git a/Data/MySQL/testsuite/TestSuite.progen b/Data/MySQL/testsuite/TestSuite.progen index bce2d53acc..a4fc8c077f 100644 --- a/Data/MySQL/testsuite/TestSuite.progen +++ b/Data/MySQL/testsuite/TestSuite.progen @@ -8,5 +8,5 @@ vc.project.configurations = debug_shared, release_shared, debug_static_mt, relea vc.project.prototype = TestSuite_vs90.vcproj mysql = ${vc.project.pocobase}\\mysql vc.project.compiler.include = ${mysql}\\include;${vc.project.pocobase}\\Foundation\\include; \ - ${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\Data\\src + ${vc.project.pocobase}\\Data\\include vc.project.linker.dependencies.Win32 = iphlpapi.lib diff --git a/Data/MySQL/testsuite/TestSuite_VS90.vcproj b/Data/MySQL/testsuite/TestSuite_VS90.vcproj index 84d1c7f37a..bcbdc3e83e 100644 --- a/Data/MySQL/testsuite/TestSuite_VS90.vcproj +++ b/Data/MySQL/testsuite/TestSuite_VS90.vcproj @@ -32,7 +32,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/MySQL/testsuite/TestSuite_vs170.vcxproj b/Data/MySQL/testsuite/TestSuite_vs170.vcxproj index 7a876ee852..083638b4e5 100644 --- a/Data/MySQL/testsuite/TestSuite_vs170.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -377,7 +377,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -406,7 +406,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -440,7 +440,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -469,7 +469,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -503,7 +503,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -532,7 +532,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -566,7 +566,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -595,7 +595,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -629,7 +629,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -658,7 +658,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -692,7 +692,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -721,7 +721,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -755,7 +755,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -784,7 +784,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -818,7 +818,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -847,7 +847,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -881,7 +881,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index 3803223af3..6e822cf500 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -1850,9 +1850,11 @@ void SQLExecutor::sessionTransaction(const std::string& connect) catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assertTrue (0 == count); - assertTrue (!_pSession->isTransaction()); - _pSession->begin(); + if (_pSession->impl()->shouldParse()) { + assertTrue (!_pSession->isTransaction()); + _pSession->begin(); + } try { (*_pSession) << "INSERT INTO Person VALUES (?,?,?,?)", use(lastNames), use(firstNames), use(addresses), use(ages), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } @@ -1936,11 +1938,13 @@ void SQLExecutor::transaction(const std::string& connect) } assertTrue (!_pSession->isTransaction()); - try { (*_pSession) << "SELECT count(*) FROM Person", into(count), now; } - catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } - catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } - assertTrue (0 == count); - assertTrue (!_pSession->isTransaction()); + if (_pSession->impl()->shouldParse()) { + try { (*_pSession) << "SELECT count(*) FROM Person", into(count), now; } + catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } + catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } + assertTrue (0 == count); + assertTrue (!_pSession->isTransaction()); + } { Transaction trans((*_pSession)); @@ -1965,7 +1969,8 @@ void SQLExecutor::transaction(const std::string& connect) catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } assertTrue (2 == count); - _pSession->begin(); + if (_pSession->impl()->shouldParse()) + _pSession->begin(); try { (*_pSession) << "DELETE FROM Person", now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } @@ -1988,6 +1993,8 @@ void SQLExecutor::transaction(const std::string& connect) sql.push_back(sql1); sql.push_back(sql2); + assertTrue (!_pSession->isTransaction()); + Transaction trans((*_pSession)); trans.execute(sql1, false); @@ -2038,6 +2045,8 @@ void SQLExecutor::reconnect() int count = 0; std::string result; + _pSession->setFeature("autoCommit", true); + try { (*_pSession) << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(age), now; } catch(ConnectionException& ce){ std::cout << ce.displayText() << std::endl; fail (funct); } catch(StatementException& se){ std::cout << se.displayText() << std::endl; fail (funct); } diff --git a/Data/ODBC/CMakeLists.txt b/Data/ODBC/CMakeLists.txt index 764f6a501a..8b10285205 100644 --- a/Data/ODBC/CMakeLists.txt +++ b/Data/ODBC/CMakeLists.txt @@ -26,7 +26,6 @@ target_include_directories(DataODBC PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ) target_compile_definitions(DataODBC PUBLIC THREADSAFE) diff --git a/Data/ODBC/Makefile b/Data/ODBC/Makefile index 9be4700cf3..b826a79df7 100644 --- a/Data/ODBC/Makefile +++ b/Data/ODBC/Makefile @@ -13,9 +13,6 @@ objects = Binder ConnectionHandle Connector EnvironmentHandle \ Parameter Preparator SessionImpl TypeInfo Unicode Utility target_includes = $(POCO_BASE)/Data/testsuite/include -ifndef POCO_DATA_NO_SQL_PARSER - target_includes += $(POCO_BASE)/Data/src -endif target = PocoDataODBC target_version = $(LIBVERSION) diff --git a/Data/ODBC/ODBC.progen b/Data/ODBC/ODBC.progen index 05f759a123..c4f142f672 100644 --- a/Data/ODBC/ODBC.progen +++ b/Data/ODBC/ODBC.progen @@ -7,7 +7,7 @@ vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Data\\include;..\\..\\Data\\src +vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Data\\include vc.project.compiler.defines = THREADSAFE vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} diff --git a/Data/ODBC/ODBC_VS90.vcproj b/Data/ODBC/ODBC_VS90.vcproj index 6566328046..820474a74d 100644 --- a/Data/ODBC/ODBC_VS90.vcproj +++ b/Data/ODBC/ODBC_VS90.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS" StringPooling="true" MinimalRebuild="true" @@ -134,7 +134,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS" StringPooling="true" RuntimeLibrary="2" @@ -221,7 +221,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE" StringPooling="true" MinimalRebuild="true" @@ -298,7 +298,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE" StringPooling="true" RuntimeLibrary="0" @@ -368,7 +368,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE" StringPooling="true" MinimalRebuild="true" @@ -445,7 +445,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE" StringPooling="true" RuntimeLibrary="2" diff --git a/Data/ODBC/ODBC_vs160.vcxproj b/Data/ODBC/ODBC_vs160.vcxproj index 9a398a943d..43d79709b9 100644 --- a/Data/ODBC/ODBC_vs160.vcxproj +++ b/Data/ODBC/ODBC_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDataODBCd PocoDataODBCmdd PocoDataODBCmtd @@ -227,7 +227,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -241,6 +241,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -261,7 +263,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -274,6 +276,8 @@ Default true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -291,7 +295,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -306,6 +310,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataODBCmtd.lib @@ -318,7 +324,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -331,6 +337,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataODBCmt.lib @@ -339,7 +347,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -354,6 +362,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataODBCmdd.lib @@ -366,7 +376,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -380,6 +390,8 @@ Default true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -389,7 +401,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -403,6 +415,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -423,7 +437,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -436,6 +450,8 @@ Default true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -453,7 +469,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -468,6 +484,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataODBCmtd.lib @@ -480,7 +498,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -493,6 +511,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataODBCmt.lib @@ -501,7 +521,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -516,6 +536,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataODBCmdd.lib @@ -528,7 +550,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -541,6 +563,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataODBCmd.lib @@ -571,42 +595,68 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true @@ -622,6 +672,8 @@ true true true + stdcpp17 + stdc11 true @@ -637,9 +689,13 @@ true true true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Data/ODBC/ODBC_vs160.vcxproj.filters b/Data/ODBC/ODBC_vs160.vcxproj.filters index a12b9ed917..e37c36630b 100644 --- a/Data/ODBC/ODBC_vs160.vcxproj.filters +++ b/Data/ODBC/ODBC_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {85a70ddf-ffdf-43ff-9d15-7314f24f8119} + {5ddd7ed9-06dd-459c-9bcc-cc4eca9a296c} - {84609c69-4c6b-454f-8d3f-6e76ffe07259} + {902075d0-3792-4698-b78e-b45f13fc3cf0} - {c0f252a5-5fdd-4d18-82d2-c1bf39392bac} + {093cfbf6-c56b-4757-ad24-26d820002cbe} diff --git a/Data/ODBC/ODBC_vs170.vcxproj b/Data/ODBC/ODBC_vs170.vcxproj index 45ad082c3c..4e215a5e98 100644 --- a/Data/ODBC/ODBC_vs170.vcxproj +++ b/Data/ODBC/ODBC_vs170.vcxproj @@ -331,7 +331,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -368,7 +368,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -401,7 +401,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -430,7 +430,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -454,7 +454,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -483,7 +483,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -507,7 +507,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -544,7 +544,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -577,7 +577,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -606,7 +606,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -630,7 +630,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -659,7 +659,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -684,7 +684,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -721,7 +721,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -754,7 +754,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -783,7 +783,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -807,7 +807,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -836,7 +836,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/ODBC_vs170.vcxproj.filters b/Data/ODBC/ODBC_vs170.vcxproj.filters index 2a6a081801..5de0c0fe3b 100644 --- a/Data/ODBC/ODBC_vs170.vcxproj.filters +++ b/Data/ODBC/ODBC_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {e7e58a10-6d53-4be9-a342-62628c6feb5f} + {ed003841-e8ed-440a-a5b3-5a9b10309562} - {efd7c933-a42d-4f50-9f6a-c8444bf44c93} + {1b16d4be-a98c-4712-b31e-2aefeb5cf438} - {398266a3-c6d5-4987-8910-a35da55d401e} + {9a908646-f5af-43bf-b294-2628e33b38cd} diff --git a/Data/ODBC/testsuite/Makefile b/Data/ODBC/testsuite/Makefile index b17f82c86e..d935264f9b 100644 --- a/Data/ODBC/testsuite/Makefile +++ b/Data/ODBC/testsuite/Makefile @@ -36,7 +36,7 @@ ifeq ($(POCO_CONFIG),MinGW) endif ifndef POCO_DATA_NO_SQL_PARSER - target_includes += $(POCO_BASE)/Data/src + target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src endif target = testrunner diff --git a/Data/ODBC/testsuite/TestSuite.progen b/Data/ODBC/testsuite/TestSuite.progen index ad611e51d4..66b339f1d8 100644 --- a/Data/ODBC/testsuite/TestSuite.progen +++ b/Data/ODBC/testsuite/TestSuite.progen @@ -6,5 +6,5 @@ vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\CppUnit\\include;..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\src;..\\..\\..\\Data\\testsuite\\DataTest\\include +vc.project.compiler.include = ..\\..\\..\\CppUnit\\include;..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\testsuite\\DataTest\\include vc.project.linker.dependencies = odbc32.lib odbccp32.lib iphlpapi.lib diff --git a/Data/ODBC/testsuite/TestSuite_VS90.vcproj b/Data/ODBC/testsuite/TestSuite_VS90.vcproj index 40f218e0f9..5eca7e5fd3 100644 --- a/Data/ODBC/testsuite/TestSuite_VS90.vcproj +++ b/Data/ODBC/testsuite/TestSuite_VS90.vcproj @@ -32,7 +32,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj index e08e2efe27..7a23c7c281 100644 --- a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -379,7 +379,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -410,7 +410,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -446,7 +446,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -477,7 +477,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -513,7 +513,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -544,7 +544,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -580,7 +580,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -611,7 +611,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -647,7 +647,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -678,7 +678,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -714,7 +714,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -745,7 +745,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -781,7 +781,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -812,7 +812,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -848,7 +848,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -879,7 +879,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -915,7 +915,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/PostgreSQL/CMakeLists.txt b/Data/PostgreSQL/CMakeLists.txt index d02c2f106d..fcd6a2c4d4 100644 --- a/Data/PostgreSQL/CMakeLists.txt +++ b/Data/PostgreSQL/CMakeLists.txt @@ -26,8 +26,6 @@ target_include_directories(DataPostgreSQL PUBLIC $ $ - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/src ) POCO_INSTALL(DataPostgreSQL) diff --git a/Data/PostgreSQL/Makefile b/Data/PostgreSQL/Makefile index 6cd7266791..622d8c0569 100644 --- a/Data/PostgreSQL/Makefile +++ b/Data/PostgreSQL/Makefile @@ -14,10 +14,6 @@ objects = Extractor BinaryExtractor Binder SessionImpl Connector \ target_includes = $(POCO_BASE)/Data/testsuite/include -ifndef POCO_DATA_NO_SQL_PARSER - target_includes += $(POCO_BASE)/Data/src -endif - target = PocoDataPostgreSQL target_version = $(LIBVERSION) diff --git a/Data/PostgreSQL/PostgreSQL.progen b/Data/PostgreSQL/PostgreSQL.progen index 02eec0eaa2..9a124e9df3 100644 --- a/Data/PostgreSQL/PostgreSQL.progen +++ b/Data/PostgreSQL/PostgreSQL.progen @@ -8,7 +8,7 @@ vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.compiler.include = ${vc.project.pocobase}\\postgresql\\include; \ - ${vc.project.pocobase}\\Foundation\\include;${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\Data\\src + ${vc.project.pocobase}\\Foundation\\include;${vc.project.pocobase}\\Data\\include vc.project.compiler.defines = vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} diff --git a/Data/PostgreSQL/PostgreSQL_VS90.vcproj b/Data/PostgreSQL/PostgreSQL_VS90.vcproj index 59e2aca3f3..78686f6f7c 100644 --- a/Data/PostgreSQL/PostgreSQL_VS90.vcproj +++ b/Data/PostgreSQL/PostgreSQL_VS90.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS" StringPooling="true" MinimalRebuild="true" @@ -136,7 +136,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS" StringPooling="true" RuntimeLibrary="2" @@ -224,7 +224,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" @@ -302,7 +302,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -373,7 +373,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" @@ -451,7 +451,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" diff --git a/Data/PostgreSQL/PostgreSQL_vs160.vcxproj b/Data/PostgreSQL/PostgreSQL_vs160.vcxproj index b181f8cc3e..fd8d0c0614 100644 --- a/Data/PostgreSQL/PostgreSQL_vs160.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDataPostgreSQLd PocoDataPostgreSQLmdd PocoDataPostgreSQLmtd @@ -227,7 +227,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -241,6 +241,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\bin\PocoDataPostgreSQLd.dll @@ -260,7 +262,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -273,6 +275,8 @@ Default true + stdcpp17 + stdc11 ..\..\bin\PocoDataPostgreSQL.dll @@ -289,7 +293,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -304,6 +308,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataPostgreSQLmtd.lib @@ -316,7 +322,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -329,6 +335,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataPostgreSQLmt.lib @@ -337,7 +345,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -352,6 +360,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataPostgreSQLmdd.lib @@ -364,7 +374,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -378,6 +388,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataPostgreSQLmd.lib @@ -386,7 +398,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -400,6 +412,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\bin64\PocoDataPostgreSQL64d.dll @@ -419,7 +433,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -432,6 +446,8 @@ Default true + stdcpp17 + stdc11 ..\..\bin64\PocoDataPostgreSQL64.dll @@ -448,7 +464,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -463,6 +479,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataPostgreSQLmtd.lib @@ -475,7 +493,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -488,6 +506,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataPostgreSQLmt.lib @@ -496,7 +516,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -511,6 +531,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataPostgreSQLmdd.lib @@ -523,7 +545,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -536,6 +558,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataPostgreSQLmd.lib @@ -544,36 +568,58 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Data/PostgreSQL/PostgreSQL_vs170.vcxproj b/Data/PostgreSQL/PostgreSQL_vs170.vcxproj index 30417e18bc..69299df540 100644 --- a/Data/PostgreSQL/PostgreSQL_vs170.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs170.vcxproj @@ -331,7 +331,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -367,7 +367,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -399,7 +399,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -428,7 +428,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -452,7 +452,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -481,7 +481,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -505,7 +505,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -541,7 +541,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -573,7 +573,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -602,7 +602,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -626,7 +626,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -655,7 +655,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -679,7 +679,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -715,7 +715,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -747,7 +747,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -776,7 +776,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -800,7 +800,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -829,7 +829,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/PostgreSQL/testsuite/Makefile b/Data/PostgreSQL/testsuite/Makefile index 5b3754f862..9898429193 100644 --- a/Data/PostgreSQL/testsuite/Makefile +++ b/Data/PostgreSQL/testsuite/Makefile @@ -14,7 +14,7 @@ SYSLIBS += -lpq -lz -lpthread -ldl objects = PostgreSQLTestSuite Driver PostgreSQLTest SQLExecutor ifndef POCO_DATA_NO_SQL_PARSER - target_includes += $(POCO_BASE)/Data/src + target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src endif target = testrunner diff --git a/Data/PostgreSQL/testsuite/TestSuite.progen b/Data/PostgreSQL/testsuite/TestSuite.progen index 3e02e52256..cc4c94765c 100644 --- a/Data/PostgreSQL/testsuite/TestSuite.progen +++ b/Data/PostgreSQL/testsuite/TestSuite.progen @@ -8,7 +8,7 @@ vc.project.configurations = debug_shared, release_shared, debug_static_mt, relea vc.project.prototype = TestSuite_vs90.vcproj postgresql = ${vc.project.pocobase}\\postgresql vc.project.compiler.include = ${postgresql}\\include;${vc.project.pocobase}\\Foundation\\include; \ - ${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\Data\\src + ${vc.project.pocobase}\\Data\\include vc.project.compiler.defines = _CRT_SECURE_NO_WARNINGS vc.project.linker.dependencies = iphlpapi.lib vc.project.linker.dependencies.debug_shared = diff --git a/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj b/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj index 205430f493..8d146be7e0 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj +++ b/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj @@ -32,7 +32,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj index cad20efcaa..1aed740d96 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -377,7 +377,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -406,7 +406,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -440,7 +440,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -469,7 +469,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -503,7 +503,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -532,7 +532,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -566,7 +566,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -595,7 +595,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -629,7 +629,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -658,7 +658,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -692,7 +692,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -721,7 +721,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -755,7 +755,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -784,7 +784,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -818,7 +818,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -847,7 +847,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -881,7 +881,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/src/sql-parser/LICENSE b/Data/SQLParser/LICENSE similarity index 100% rename from Data/src/sql-parser/LICENSE rename to Data/SQLParser/LICENSE diff --git a/Data/src/sql-parser/Makefile b/Data/SQLParser/Makefile similarity index 100% rename from Data/src/sql-parser/Makefile rename to Data/SQLParser/Makefile diff --git a/Data/src/sql-parser/README.md b/Data/SQLParser/README.md similarity index 100% rename from Data/src/sql-parser/README.md rename to Data/SQLParser/README.md diff --git a/Data/src/sql-parser/benchmark/README.md b/Data/SQLParser/benchmark/README.md similarity index 100% rename from Data/src/sql-parser/benchmark/README.md rename to Data/SQLParser/benchmark/README.md diff --git a/Data/src/sql-parser/benchmark/benchmark.cpp b/Data/SQLParser/benchmark/benchmark.cpp similarity index 100% rename from Data/src/sql-parser/benchmark/benchmark.cpp rename to Data/SQLParser/benchmark/benchmark.cpp diff --git a/Data/src/sql-parser/benchmark/benchmark_utils.cpp b/Data/SQLParser/benchmark/benchmark_utils.cpp similarity index 100% rename from Data/src/sql-parser/benchmark/benchmark_utils.cpp rename to Data/SQLParser/benchmark/benchmark_utils.cpp diff --git a/Data/src/sql-parser/benchmark/benchmark_utils.h b/Data/SQLParser/benchmark/benchmark_utils.h similarity index 100% rename from Data/src/sql-parser/benchmark/benchmark_utils.h rename to Data/SQLParser/benchmark/benchmark_utils.h diff --git a/Data/src/sql-parser/benchmark/parser_benchmark.cpp b/Data/SQLParser/benchmark/parser_benchmark.cpp similarity index 100% rename from Data/src/sql-parser/benchmark/parser_benchmark.cpp rename to Data/SQLParser/benchmark/parser_benchmark.cpp diff --git a/Data/src/sql-parser/benchmark/queries.cpp b/Data/SQLParser/benchmark/queries.cpp similarity index 100% rename from Data/src/sql-parser/benchmark/queries.cpp rename to Data/SQLParser/benchmark/queries.cpp diff --git a/Data/src/sql-parser/benchmark/queries.h b/Data/SQLParser/benchmark/queries.h similarity index 100% rename from Data/src/sql-parser/benchmark/queries.h rename to Data/SQLParser/benchmark/queries.h diff --git a/Data/src/sql-parser/src/SQLParser.cpp b/Data/SQLParser/src/SQLParser.cpp similarity index 100% rename from Data/src/sql-parser/src/SQLParser.cpp rename to Data/SQLParser/src/SQLParser.cpp diff --git a/Data/src/sql-parser/src/SQLParser.h b/Data/SQLParser/src/SQLParser.h similarity index 100% rename from Data/src/sql-parser/src/SQLParser.h rename to Data/SQLParser/src/SQLParser.h diff --git a/Data/src/sql-parser/src/SQLParserResult.cpp b/Data/SQLParser/src/SQLParserResult.cpp similarity index 100% rename from Data/src/sql-parser/src/SQLParserResult.cpp rename to Data/SQLParser/src/SQLParserResult.cpp diff --git a/Data/src/sql-parser/src/SQLParserResult.h b/Data/SQLParser/src/SQLParserResult.h similarity index 100% rename from Data/src/sql-parser/src/SQLParserResult.h rename to Data/SQLParser/src/SQLParserResult.h diff --git a/Data/src/sql-parser/src/parser/.gitignore b/Data/SQLParser/src/parser/.gitignore similarity index 100% rename from Data/src/sql-parser/src/parser/.gitignore rename to Data/SQLParser/src/parser/.gitignore diff --git a/Data/src/sql-parser/src/parser/Makefile b/Data/SQLParser/src/parser/Makefile similarity index 100% rename from Data/src/sql-parser/src/parser/Makefile rename to Data/SQLParser/src/parser/Makefile diff --git a/Data/src/sql-parser/src/parser/bison_parser.cpp b/Data/SQLParser/src/parser/bison_parser.cpp similarity index 100% rename from Data/src/sql-parser/src/parser/bison_parser.cpp rename to Data/SQLParser/src/parser/bison_parser.cpp diff --git a/Data/src/sql-parser/src/parser/bison_parser.h b/Data/SQLParser/src/parser/bison_parser.h similarity index 100% rename from Data/src/sql-parser/src/parser/bison_parser.h rename to Data/SQLParser/src/parser/bison_parser.h diff --git a/Data/src/sql-parser/src/parser/bison_parser.y b/Data/SQLParser/src/parser/bison_parser.y similarity index 100% rename from Data/src/sql-parser/src/parser/bison_parser.y rename to Data/SQLParser/src/parser/bison_parser.y diff --git a/Data/src/sql-parser/src/parser/flex_lexer.cpp b/Data/SQLParser/src/parser/flex_lexer.cpp similarity index 100% rename from Data/src/sql-parser/src/parser/flex_lexer.cpp rename to Data/SQLParser/src/parser/flex_lexer.cpp diff --git a/Data/src/sql-parser/src/parser/flex_lexer.h b/Data/SQLParser/src/parser/flex_lexer.h similarity index 100% rename from Data/src/sql-parser/src/parser/flex_lexer.h rename to Data/SQLParser/src/parser/flex_lexer.h diff --git a/Data/src/sql-parser/src/parser/flex_lexer.l b/Data/SQLParser/src/parser/flex_lexer.l similarity index 100% rename from Data/src/sql-parser/src/parser/flex_lexer.l rename to Data/SQLParser/src/parser/flex_lexer.l diff --git a/Data/src/sql-parser/src/parser/keywordlist_generator.py b/Data/SQLParser/src/parser/keywordlist_generator.py similarity index 100% rename from Data/src/sql-parser/src/parser/keywordlist_generator.py rename to Data/SQLParser/src/parser/keywordlist_generator.py diff --git a/Data/src/sql-parser/src/parser/parser_typedef.h b/Data/SQLParser/src/parser/parser_typedef.h similarity index 100% rename from Data/src/sql-parser/src/parser/parser_typedef.h rename to Data/SQLParser/src/parser/parser_typedef.h diff --git a/Data/src/sql-parser/src/parser/sql_keywords.txt b/Data/SQLParser/src/parser/sql_keywords.txt similarity index 100% rename from Data/src/sql-parser/src/parser/sql_keywords.txt rename to Data/SQLParser/src/parser/sql_keywords.txt diff --git a/Data/src/sql-parser/src/sql/AlterStatement.h b/Data/SQLParser/src/sql/AlterStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/AlterStatement.h rename to Data/SQLParser/src/sql/AlterStatement.h diff --git a/Data/src/sql-parser/src/sql/ColumnType.h b/Data/SQLParser/src/sql/ColumnType.h similarity index 95% rename from Data/src/sql-parser/src/sql/ColumnType.h rename to Data/SQLParser/src/sql/ColumnType.h index 6eb9ed470b..d756e2462f 100644 --- a/Data/src/sql-parser/src/sql/ColumnType.h +++ b/Data/SQLParser/src/sql/ColumnType.h @@ -1,7 +1,7 @@ #ifndef SQLPARSER_COLUMN_TYPE_H #define SQLPARSER_COLUMN_TYPE_H -#include"sql-parser/src/sqlparser_win.h" +#include"sqlparser_win.h" #include namespace hsql { diff --git a/Data/src/sql-parser/src/sql/CreateStatement.cpp b/Data/SQLParser/src/sql/CreateStatement.cpp similarity index 100% rename from Data/src/sql-parser/src/sql/CreateStatement.cpp rename to Data/SQLParser/src/sql/CreateStatement.cpp diff --git a/Data/src/sql-parser/src/sql/CreateStatement.h b/Data/SQLParser/src/sql/CreateStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/CreateStatement.h rename to Data/SQLParser/src/sql/CreateStatement.h diff --git a/Data/src/sql-parser/src/sql/DeleteStatement.h b/Data/SQLParser/src/sql/DeleteStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/DeleteStatement.h rename to Data/SQLParser/src/sql/DeleteStatement.h diff --git a/Data/src/sql-parser/src/sql/DropStatement.h b/Data/SQLParser/src/sql/DropStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/DropStatement.h rename to Data/SQLParser/src/sql/DropStatement.h diff --git a/Data/src/sql-parser/src/sql/ExecuteStatement.h b/Data/SQLParser/src/sql/ExecuteStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/ExecuteStatement.h rename to Data/SQLParser/src/sql/ExecuteStatement.h diff --git a/Data/src/sql-parser/src/sql/ExportStatement.h b/Data/SQLParser/src/sql/ExportStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/ExportStatement.h rename to Data/SQLParser/src/sql/ExportStatement.h diff --git a/Data/src/sql-parser/src/sql/Expr.cpp b/Data/SQLParser/src/sql/Expr.cpp similarity index 100% rename from Data/src/sql-parser/src/sql/Expr.cpp rename to Data/SQLParser/src/sql/Expr.cpp diff --git a/Data/src/sql-parser/src/sql/Expr.h b/Data/SQLParser/src/sql/Expr.h similarity index 100% rename from Data/src/sql-parser/src/sql/Expr.h rename to Data/SQLParser/src/sql/Expr.h diff --git a/Data/src/sql-parser/src/sql/ImportStatement.h b/Data/SQLParser/src/sql/ImportStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/ImportStatement.h rename to Data/SQLParser/src/sql/ImportStatement.h diff --git a/Data/src/sql-parser/src/sql/InsertStatement.h b/Data/SQLParser/src/sql/InsertStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/InsertStatement.h rename to Data/SQLParser/src/sql/InsertStatement.h diff --git a/Data/src/sql-parser/src/sql/PrepareStatement.cpp b/Data/SQLParser/src/sql/PrepareStatement.cpp similarity index 100% rename from Data/src/sql-parser/src/sql/PrepareStatement.cpp rename to Data/SQLParser/src/sql/PrepareStatement.cpp diff --git a/Data/src/sql-parser/src/sql/PrepareStatement.h b/Data/SQLParser/src/sql/PrepareStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/PrepareStatement.h rename to Data/SQLParser/src/sql/PrepareStatement.h diff --git a/Data/src/sql-parser/src/sql/SQLStatement.cpp b/Data/SQLParser/src/sql/SQLStatement.cpp similarity index 100% rename from Data/src/sql-parser/src/sql/SQLStatement.cpp rename to Data/SQLParser/src/sql/SQLStatement.cpp diff --git a/Data/src/sql-parser/src/sql/SQLStatement.h b/Data/SQLParser/src/sql/SQLStatement.h similarity index 95% rename from Data/src/sql-parser/src/sql/SQLStatement.h rename to Data/SQLParser/src/sql/SQLStatement.h index b0763f83e6..c0aa1e472f 100644 --- a/Data/src/sql-parser/src/sql/SQLStatement.h +++ b/Data/SQLParser/src/sql/SQLStatement.h @@ -2,7 +2,7 @@ #define SQLPARSER_SQLSTATEMENT_H #include -#include "sql-parser/src/sqlparser_win.h" +#include "sqlparser_win.h" #include "Expr.h" namespace hsql { diff --git a/Data/src/sql-parser/src/sql/SelectStatement.h b/Data/SQLParser/src/sql/SelectStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/SelectStatement.h rename to Data/SQLParser/src/sql/SelectStatement.h diff --git a/Data/src/sql-parser/src/sql/ShowStatement.h b/Data/SQLParser/src/sql/ShowStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/ShowStatement.h rename to Data/SQLParser/src/sql/ShowStatement.h diff --git a/Data/src/sql-parser/src/sql/Table.h b/Data/SQLParser/src/sql/Table.h similarity index 100% rename from Data/src/sql-parser/src/sql/Table.h rename to Data/SQLParser/src/sql/Table.h diff --git a/Data/src/sql-parser/src/sql/TransactionStatement.h b/Data/SQLParser/src/sql/TransactionStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/TransactionStatement.h rename to Data/SQLParser/src/sql/TransactionStatement.h diff --git a/Data/src/sql-parser/src/sql/UpdateStatement.h b/Data/SQLParser/src/sql/UpdateStatement.h similarity index 100% rename from Data/src/sql-parser/src/sql/UpdateStatement.h rename to Data/SQLParser/src/sql/UpdateStatement.h diff --git a/Data/src/sql-parser/src/sql/statements.cpp b/Data/SQLParser/src/sql/statements.cpp similarity index 100% rename from Data/src/sql-parser/src/sql/statements.cpp rename to Data/SQLParser/src/sql/statements.cpp diff --git a/Data/src/sql-parser/src/sql/statements.h b/Data/SQLParser/src/sql/statements.h similarity index 100% rename from Data/src/sql-parser/src/sql/statements.h rename to Data/SQLParser/src/sql/statements.h diff --git a/Data/src/sql-parser/src/sqlparser_win.h b/Data/SQLParser/src/sqlparser_win.h similarity index 100% rename from Data/src/sql-parser/src/sqlparser_win.h rename to Data/SQLParser/src/sqlparser_win.h diff --git a/Data/src/sql-parser/src/util/sqlhelper.cpp b/Data/SQLParser/src/util/sqlhelper.cpp similarity index 100% rename from Data/src/sql-parser/src/util/sqlhelper.cpp rename to Data/SQLParser/src/util/sqlhelper.cpp diff --git a/Data/src/sql-parser/src/util/sqlhelper.h b/Data/SQLParser/src/util/sqlhelper.h similarity index 100% rename from Data/src/sql-parser/src/util/sqlhelper.h rename to Data/SQLParser/src/util/sqlhelper.h diff --git a/Data/src/sql-parser/test/auto_query_file_test.cpp b/Data/SQLParser/test/auto_query_file_test.cpp similarity index 100% rename from Data/src/sql-parser/test/auto_query_file_test.cpp rename to Data/SQLParser/test/auto_query_file_test.cpp diff --git a/Data/src/sql-parser/test/prepare_tests.cpp b/Data/SQLParser/test/prepare_tests.cpp similarity index 100% rename from Data/src/sql-parser/test/prepare_tests.cpp rename to Data/SQLParser/test/prepare_tests.cpp diff --git a/Data/src/sql-parser/test/queries/queries-bad.sql b/Data/SQLParser/test/queries/queries-bad.sql similarity index 100% rename from Data/src/sql-parser/test/queries/queries-bad.sql rename to Data/SQLParser/test/queries/queries-bad.sql diff --git a/Data/src/sql-parser/test/queries/queries-good.sql b/Data/SQLParser/test/queries/queries-good.sql similarity index 100% rename from Data/src/sql-parser/test/queries/queries-good.sql rename to Data/SQLParser/test/queries/queries-good.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-01.sql b/Data/SQLParser/test/queries/tpc-h-01.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-01.sql rename to Data/SQLParser/test/queries/tpc-h-01.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-02.sql b/Data/SQLParser/test/queries/tpc-h-02.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-02.sql rename to Data/SQLParser/test/queries/tpc-h-02.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-03.sql b/Data/SQLParser/test/queries/tpc-h-03.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-03.sql rename to Data/SQLParser/test/queries/tpc-h-03.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-04.sql b/Data/SQLParser/test/queries/tpc-h-04.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-04.sql rename to Data/SQLParser/test/queries/tpc-h-04.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-05.sql b/Data/SQLParser/test/queries/tpc-h-05.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-05.sql rename to Data/SQLParser/test/queries/tpc-h-05.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-06.sql b/Data/SQLParser/test/queries/tpc-h-06.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-06.sql rename to Data/SQLParser/test/queries/tpc-h-06.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-07.sql b/Data/SQLParser/test/queries/tpc-h-07.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-07.sql rename to Data/SQLParser/test/queries/tpc-h-07.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-08.sql b/Data/SQLParser/test/queries/tpc-h-08.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-08.sql rename to Data/SQLParser/test/queries/tpc-h-08.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-09.sql b/Data/SQLParser/test/queries/tpc-h-09.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-09.sql rename to Data/SQLParser/test/queries/tpc-h-09.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-10.sql b/Data/SQLParser/test/queries/tpc-h-10.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-10.sql rename to Data/SQLParser/test/queries/tpc-h-10.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-11.sql b/Data/SQLParser/test/queries/tpc-h-11.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-11.sql rename to Data/SQLParser/test/queries/tpc-h-11.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-12.sql b/Data/SQLParser/test/queries/tpc-h-12.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-12.sql rename to Data/SQLParser/test/queries/tpc-h-12.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-13.sql b/Data/SQLParser/test/queries/tpc-h-13.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-13.sql rename to Data/SQLParser/test/queries/tpc-h-13.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-14.sql b/Data/SQLParser/test/queries/tpc-h-14.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-14.sql rename to Data/SQLParser/test/queries/tpc-h-14.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-15.sql b/Data/SQLParser/test/queries/tpc-h-15.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-15.sql rename to Data/SQLParser/test/queries/tpc-h-15.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-16.sql b/Data/SQLParser/test/queries/tpc-h-16.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-16.sql rename to Data/SQLParser/test/queries/tpc-h-16.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-17.sql b/Data/SQLParser/test/queries/tpc-h-17.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-17.sql rename to Data/SQLParser/test/queries/tpc-h-17.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-18.sql b/Data/SQLParser/test/queries/tpc-h-18.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-18.sql rename to Data/SQLParser/test/queries/tpc-h-18.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-19.sql b/Data/SQLParser/test/queries/tpc-h-19.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-19.sql rename to Data/SQLParser/test/queries/tpc-h-19.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-20.sql b/Data/SQLParser/test/queries/tpc-h-20.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-20.sql rename to Data/SQLParser/test/queries/tpc-h-20.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-21.sql b/Data/SQLParser/test/queries/tpc-h-21.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-21.sql rename to Data/SQLParser/test/queries/tpc-h-21.sql diff --git a/Data/src/sql-parser/test/queries/tpc-h-22.sql b/Data/SQLParser/test/queries/tpc-h-22.sql similarity index 100% rename from Data/src/sql-parser/test/queries/tpc-h-22.sql rename to Data/SQLParser/test/queries/tpc-h-22.sql diff --git a/Data/src/sql-parser/test/select_tests.cpp b/Data/SQLParser/test/select_tests.cpp similarity index 100% rename from Data/src/sql-parser/test/select_tests.cpp rename to Data/SQLParser/test/select_tests.cpp diff --git a/Data/src/sql-parser/test/sql_asserts.h b/Data/SQLParser/test/sql_asserts.h similarity index 100% rename from Data/src/sql-parser/test/sql_asserts.h rename to Data/SQLParser/test/sql_asserts.h diff --git a/Data/src/sql-parser/test/sql_parser.cpp b/Data/SQLParser/test/sql_parser.cpp similarity index 100% rename from Data/src/sql-parser/test/sql_parser.cpp rename to Data/SQLParser/test/sql_parser.cpp diff --git a/Data/src/sql-parser/test/sql_tests.cpp b/Data/SQLParser/test/sql_tests.cpp similarity index 100% rename from Data/src/sql-parser/test/sql_tests.cpp rename to Data/SQLParser/test/sql_tests.cpp diff --git a/Data/src/sql-parser/test/test.sh b/Data/SQLParser/test/test.sh similarity index 100% rename from Data/src/sql-parser/test/test.sh rename to Data/SQLParser/test/test.sh diff --git a/Data/src/sql-parser/test/thirdparty/microtest/microtest.h b/Data/SQLParser/test/thirdparty/microtest/microtest.h similarity index 100% rename from Data/src/sql-parser/test/thirdparty/microtest/microtest.h rename to Data/SQLParser/test/thirdparty/microtest/microtest.h diff --git a/Data/src/sql-parser/test/tpc_h_tests.cpp b/Data/SQLParser/test/tpc_h_tests.cpp similarity index 100% rename from Data/src/sql-parser/test/tpc_h_tests.cpp rename to Data/SQLParser/test/tpc_h_tests.cpp diff --git a/Data/SQLite/Makefile b/Data/SQLite/Makefile index c6a67219d2..de563d7dda 100644 --- a/Data/SQLite/Makefile +++ b/Data/SQLite/Makefile @@ -22,7 +22,7 @@ else endif ifndef POCO_DATA_NO_SQL_PARSER - target_includes = $(POCO_BASE)/Data/src + target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src endif target = PocoDataSQLite diff --git a/Data/SQLite/SQLite.progen b/Data/SQLite/SQLite.progen index aae7329fa3..48d7f5f4d4 100644 --- a/Data/SQLite/SQLite.progen +++ b/Data/SQLite/SQLite.progen @@ -7,7 +7,7 @@ vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Data\\include;..\\..\\Data\\src +vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Data\\include vc.project.compiler.defines = SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} diff --git a/Data/SQLite/SQLite_VS90.vcproj b/Data/SQLite/SQLite_VS90.vcproj index 10d03ec235..0f7bd0856b 100644 --- a/Data/SQLite/SQLite_VS90.vcproj +++ b/Data/SQLite/SQLite_VS90.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS" StringPooling="true" MinimalRebuild="true" @@ -134,7 +134,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS" StringPooling="true" RuntimeLibrary="2" @@ -221,7 +221,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED" StringPooling="true" MinimalRebuild="true" @@ -298,7 +298,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED" StringPooling="true" RuntimeLibrary="0" @@ -368,7 +368,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED" StringPooling="true" MinimalRebuild="true" @@ -445,7 +445,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED" StringPooling="true" RuntimeLibrary="2" diff --git a/Data/SQLite/SQLite_vs160.vcxproj b/Data/SQLite/SQLite_vs160.vcxproj index a3451a702b..48433d4c12 100644 --- a/Data/SQLite/SQLite_vs160.vcxproj +++ b/Data/SQLite/SQLite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDataSQLited PocoDataSQLitemdd PocoDataSQLitemtd @@ -227,7 +227,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -242,6 +242,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\bin\PocoDataSQLited.dll @@ -261,7 +263,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -275,6 +277,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\bin\PocoDataSQLite.dll @@ -291,7 +295,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -307,6 +311,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib\PocoDataSQLitemtd.lib @@ -319,7 +325,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreaded @@ -333,6 +339,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib\PocoDataSQLitemt.lib @@ -341,7 +349,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -357,6 +365,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib\PocoDataSQLitemdd.lib @@ -369,7 +379,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -384,6 +394,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib\PocoDataSQLitemd.lib @@ -392,7 +404,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -407,6 +419,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\bin64\PocoDataSQLite64d.dll @@ -426,7 +440,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -440,6 +454,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\bin64\PocoDataSQLite64.dll @@ -456,7 +472,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -472,6 +488,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib64\PocoDataSQLitemtd.lib @@ -484,7 +502,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreaded @@ -498,6 +516,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib64\PocoDataSQLitemt.lib @@ -506,7 +526,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -522,6 +542,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib64\PocoDataSQLitemdd.lib @@ -534,7 +556,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -548,6 +570,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib64\PocoDataSQLitemd.lib @@ -568,30 +592,48 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Data/SQLite/SQLite_vs160.vcxproj.filters b/Data/SQLite/SQLite_vs160.vcxproj.filters index 8e7f78c26c..dbdc3405b7 100644 --- a/Data/SQLite/SQLite_vs160.vcxproj.filters +++ b/Data/SQLite/SQLite_vs160.vcxproj.filters @@ -2,22 +2,22 @@ - {a9c4986e-093e-45c6-9d8e-bb77226b4b7b} + {35ac7a5f-3122-4b02-ba58-890ce6bffd47} - {0e4f061e-d880-4496-bb90-ea6ef99d7b4d} + {feea0252-6fc3-440f-b06d-da54042b86e3} - {aa4f801f-fcaf-44b5-bcb0-3516ffe084ce} + {890e89e4-3c52-4f35-a521-fd5e1c2a12bf} - {54e5ea14-8781-4939-a457-4457a136be3a} + {17d87956-cc8c-491c-846b-95f69c0b995f} - {975d7fb2-b6c5-46c2-8f4f-56629285cfc6} + {4e7eadc1-8dc4-41c8-a9a2-b618af8cfca0} - {71124ce4-c134-4836-a5e8-ecdf3e3a5bfa} + {29293288-da79-409b-8b4f-bcee1bf2e1b3} diff --git a/Data/SQLite/SQLite_vs170.vcxproj b/Data/SQLite/SQLite_vs170.vcxproj index d4c5428763..d81239abdb 100644 --- a/Data/SQLite/SQLite_vs170.vcxproj +++ b/Data/SQLite/SQLite_vs170.vcxproj @@ -331,7 +331,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -368,7 +368,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -401,7 +401,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -431,7 +431,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreaded @@ -456,7 +456,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -486,7 +486,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -511,7 +511,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -548,7 +548,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -581,7 +581,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -611,7 +611,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreaded @@ -636,7 +636,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -666,7 +666,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -691,7 +691,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -728,7 +728,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -761,7 +761,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -791,7 +791,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreaded @@ -816,7 +816,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -846,7 +846,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/SQLite/SQLite_vs170.vcxproj.filters b/Data/SQLite/SQLite_vs170.vcxproj.filters index 30cb72dd6d..6a4ab8b3ec 100644 --- a/Data/SQLite/SQLite_vs170.vcxproj.filters +++ b/Data/SQLite/SQLite_vs170.vcxproj.filters @@ -2,22 +2,22 @@ - {1bad0647-a4aa-4822-a8ea-93f788ff7be1} + {cd53f9bd-a54e-471b-baca-7dc9c716d85e} - {b81dd631-b740-450c-8fda-ba9c8d87c466} + {e55c2057-b0a9-40c5-bdab-2a4f4dee0ed4} - {d8fc7394-be23-4595-962f-53b9acdda727} + {00217a54-1806-4de4-8266-1cfbd2981e70} - {52dda208-a7cf-4967-a74f-88b1e0e30026} + {429811b8-9994-460a-af2b-b615a938fa8d} - {f8e8c0dd-45d7-4f06-8814-ccec0b5d03c6} + {beefb226-4ea2-4e1a-a948-8c03473ce75a} - {4aa8c8c7-825e-46aa-8e36-59985cef50b2} + {a3482cc4-c21d-40bd-9f65-e1678f03aeb9} diff --git a/Data/SQLite/testsuite/Makefile b/Data/SQLite/testsuite/Makefile index 5f8fcad7cc..58ab790a12 100644 --- a/Data/SQLite/testsuite/Makefile +++ b/Data/SQLite/testsuite/Makefile @@ -10,7 +10,7 @@ objects = SQLiteTestSuite Driver \ SQLiteTest ifndef POCO_DATA_NO_SQL_PARSER - target_includes = $(POCO_BASE)/Data/src + target_includes = $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src endif target = testrunner diff --git a/Data/SQLite/testsuite/TestSuite.progen b/Data/SQLite/testsuite/TestSuite.progen index c0784b9350..a156305a65 100644 --- a/Data/SQLite/testsuite/TestSuite.progen +++ b/Data/SQLite/testsuite/TestSuite.progen @@ -6,5 +6,5 @@ vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\src +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/SQLite/testsuite/TestSuite_VS90.vcproj b/Data/SQLite/testsuite/TestSuite_VS90.vcproj index af17fce998..76508a1c03 100644 --- a/Data/SQLite/testsuite/TestSuite_VS90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_VS90.vcproj @@ -32,7 +32,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj index b9f7423308..401b89f379 100644 --- a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -379,7 +379,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -410,7 +410,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -446,7 +446,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -477,7 +477,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -513,7 +513,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -544,7 +544,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -580,7 +580,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -611,7 +611,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -647,7 +647,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -678,7 +678,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -714,7 +714,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -745,7 +745,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -781,7 +781,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -812,7 +812,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -848,7 +848,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -879,7 +879,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -915,7 +915,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/extradirs b/Data/extradirs new file mode 100644 index 0000000000..e27d52a223 --- /dev/null +++ b/Data/extradirs @@ -0,0 +1 @@ +SQLParser diff --git a/Data/include/Poco/Data/AbstractSessionImpl.h b/Data/include/Poco/Data/AbstractSessionImpl.h index 0fdfa92993..572a80d704 100644 --- a/Data/include/Poco/Data/AbstractSessionImpl.h +++ b/Data/include/Poco/Data/AbstractSessionImpl.h @@ -56,7 +56,7 @@ class AbstractSessionImpl: public SessionImpl _bulk(false), _emptyStringIsNull(false), _forceEmptyString(false), - _sqlParse(true), + _sqlParse(false), _autoCommit(true) /// Creates the AbstractSessionImpl. /// @@ -90,6 +90,18 @@ class AbstractSessionImpl: public SessionImpl /// While these features can not both be true at the same time, they can both be false, /// resulting in default underlying database behavior. /// + /// Adds "sqlParse" feature and sets it to false; this property enables parsing of the SQL queries, + /// to help the Data framework to determine whether to start a transaction automatically in + /// non-autocomit mode (ie. not to start transaction if all the queries in an SQL statement are SELECTs). + /// Note that the property is not a bullet-proof way to ensure this behavior, because not all SQL dialects + /// are supported by the parser. When enabled, the parsing has performance cost, but it is otherwise + /// non-intrusive, ie. on parse failure Statement only internally records parsing errors, but does not throw. + /// See Poco::Data::Statement documentation for more information. + /// This property has no effect when Poco::Data library is compiled with POCO_DATA_NO_SQL_PARSER. + /// + /// Adds "autoCommit" feature and sets it to true. This property enables automatic commit. + /// Setting this feature to true renders the `sqlParse` property meaningless, because every query + /// is automatically commited. { addProperty("storage", &AbstractSessionImpl::setStorage, diff --git a/Data/include/Poco/Data/SQLParser.h b/Data/include/Poco/Data/SQLParser.h deleted file mode 100644 index f86729d6b8..0000000000 --- a/Data/include/Poco/Data/SQLParser.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// SQLParser.h -// -// Library: Data -// Package: SQLParser -// Module: SQLParser -// -// Forward header for the SQLParser class. -// -// Copyright (c) 2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#ifndef Data_SQLParser_INCLUDED -#define Data_SQLParser_INCLUDED - -#include "Poco/Config.h" - - -#ifndef POCO_DATA_NO_SQL_PARSER - - -#include "sql-parser/src/SQLParser.h" -#include "sql-parser/src/SQLParserResult.h" -#include "sql-parser/src/util/sqlhelper.h" - - -namespace Poco { -namespace Data { - - namespace Parser = hsql; // namespace Poco::Data::Parser - -} } // namespace Poco::Data - - -#endif // POCO_DATA_NO_SQL_PARSER - - -#endif // Data_SQLParser_INCLUDED diff --git a/Data/include/Poco/Data/Statement.h b/Data/include/Poco/Data/Statement.h index 7aeba69b3f..c3a4164b8d 100644 --- a/Data/include/Poco/Data/Statement.h +++ b/Data/include/Poco/Data/Statement.h @@ -24,7 +24,6 @@ #include "Poco/Data/Range.h" #include "Poco/Data/Bulk.h" #include "Poco/Data/Row.h" -#include "Poco/Data/SQLParser.h" #include "Poco/Data/SimpleRowFormatter.h" #include "Poco/SharedPtr.h" #include "Poco/Mutex.h" @@ -34,10 +33,22 @@ #include "Poco/Optional.h" #include +#ifndef POCO_DATA_NO_SQL_PARSER + +namespace hsql { + class SQLParserResult; +} + +#endif // POCO_DATA_NO_SQL_PARSER namespace Poco { namespace Data { +#ifndef POCO_DATA_NO_SQL_PARSER + +namespace Parser = hsql; // namespace Poco::Data::Parser + +#endif // POCO_DATA_NO_SQL_PARSER class AbstractBinding; class AbstractExtraction; @@ -307,6 +318,8 @@ class Data_API Statement Optional statementsCount() const; /// Returns the total number of SQL statements held in the accummulated SQL statement. + /// + /// For Poco::Data builds with POCO_DATA_NO_SQL_PARSER, it always returns unspecified. Optional parse(); /// Parses the SQL statement and returns true if successful. @@ -315,42 +328,44 @@ class Data_API Statement /// keywords not supported by the parser. Parsing failures are silent in terms of /// throwing exceptions or logging, but it is possible to get error information by /// calling parseError(). + /// + /// For Poco::Data builds with POCO_DATA_NO_SQL_PARSER, it always returns unspecified. const std::string& parseError(); /// Returns the SQL statement parse error message, if any. - /// For Poco::Data builds without SQLParser, it always returns empty string. + /// For Poco::Data builds with POCO_DATA_NO_SQL_PARSER, it always returns an empty string. Optional isSelect() const; /// Returns true if the statement consists only of SELECT statement(s). - /// For Poco::Data builds without SQLParser, it always returns unspecified. + /// For Poco::Data builds with POCO_DATA_NO_SQL_PARSER, it always returns unspecified. Optional isInsert() const; /// Returns true if the statement consists only of INSERT statement(s). - /// For Poco::Data builds without SQLParser, it always returns unspecified. + /// For Poco::Data builds with POCO_DATA_NO_SQL_PARSER, it always returns unspecified. Optional isUpdate() const; /// Returns true if the statement consists only of UPDATE statement(s). - /// For Poco::Data builds without SQLParser, it always returns unspecified. + /// For Poco::Data builds with POCO_DATA_NO_SQL_PARSER, it always returns unspecified. Optional isDelete() const; /// Returns true if the statement consists only of DELETE statement(s). - /// For Poco::Data builds without SQLParser, it always returns unspecified. + /// For Poco::Data builds with POCO_DATA_NO_SQL_PARSER, it always returns unspecified. Optional hasSelect() const; /// Returns true if the statement contains a SELECT statement. - /// For Poco::Data builds without SQLParser, it always returns unspecified. + /// For Poco::Data builds with POCO_DATA_NO_SQL_PARSER, it always returns unspecified. Optional hasInsert() const; /// Returns true if the statement contains an INSERT statement. - /// For Poco::Data builds without SQLParser, it always returns unspecified. + /// For Poco::Data builds with POCO_DATA_NO_SQL_PARSER, it always returns unspecified. Optional hasUpdate() const; /// Returns true if the statement contains an UPDATE statement. - /// For Poco::Data builds without SQLParser, it always returns unspecified. + /// For Poco::Data builds with POCO_DATA_NO_SQL_PARSER, it always returns unspecified. Optional hasDelete() const; /// Returns true if the statement contains a DELETE statement. - /// For Poco::Data builds without SQLParser, it always returns unspecified. + /// For Poco::Data builds with POCO_DATA_NO_SQL_PARSER, it always returns unspecified. std::size_t execute(bool reset = true); /// Executes the statement synchronously or asynchronously. @@ -537,15 +552,16 @@ class Data_API Statement #ifndef POCO_DATA_NO_SQL_PARSER - bool isType(Parser::StatementType type) const; + bool isType(unsigned int type) const; /// Returns true if the statement is of the argument type. - bool hasType(Parser::StatementType type) const; + bool hasType(unsigned int type) const; /// Returns true if the statement is of the argument type. Poco::SharedPtr _pParseResult; std::string _parseError; -#endif // POCO_DATA_NO_SQL_PARSER + +#endif // POCO_DATA_NO_SQL_PARSER StatementImpl::Ptr _pImpl; @@ -568,113 +584,6 @@ inline std::size_t Statement::subTotalRowCount(int dataSet) const } -inline const std::string& Statement::parseError() -{ -#ifdef POCO_DATA_NO_SQL_PARSER - static std::string empty; - return empty; -#else - return _parseError; -#endif -} - - -inline Optional Statement::isSelect() const -{ -#ifndef POCO_DATA_NO_SQL_PARSER - if (_pImpl->session().shouldParse()) - return isType(Parser::StatementType::kStmtSelect); - else return Optional(); -#else - return Optional(); -#endif -} - - -inline Optional Statement::isInsert() const -{ -#ifndef POCO_DATA_NO_SQL_PARSER - if (_pImpl->session().shouldParse()) - return isType(Parser::StatementType::kStmtInsert); - else return Optional(); -#else - return Optional(); -#endif -} - - -inline Optional Statement::isUpdate() const -{ -#ifndef POCO_DATA_NO_SQL_PARSER - if (_pImpl->session().shouldParse()) - return isType(Parser::StatementType::kStmtUpdate); - else return Optional(); -#else - return Optional(); -#endif -} - - -inline Optional Statement::isDelete() const -{ -#ifndef POCO_DATA_NO_SQL_PARSER - if (_pImpl->session().shouldParse()) - return isType(Parser::StatementType::kStmtDelete); - else return Optional(); -#else - return Optional(); -#endif -} - - -inline Optional Statement::hasSelect() const -{ -#ifndef POCO_DATA_NO_SQL_PARSER - if (_pImpl->session().shouldParse()) - return hasType(Parser::StatementType::kStmtSelect); - else return Optional(); -#else - return Optional(); -#endif -} - - -inline Optional Statement::hasInsert() const -{ -#ifndef POCO_DATA_NO_SQL_PARSER - if (_pImpl->session().shouldParse()) - return hasType(Parser::StatementType::kStmtInsert); - else return Optional(); -#else - return Optional(); -#endif -} - - -inline Optional Statement::hasUpdate() const -{ -#ifndef POCO_DATA_NO_SQL_PARSER - if (_pImpl->session().shouldParse()) - return hasType(Parser::StatementType::kStmtUpdate); - else return Optional(); -#else - return Optional(); -#endif -} - - -inline Optional Statement::hasDelete() const -{ -#ifndef POCO_DATA_NO_SQL_PARSER - if (_pImpl->session().shouldParse()) - return hasType(Parser::StatementType::kStmtDelete); - else return Optional(); -#else - return Optional(); -#endif -} - - namespace Keywords { diff --git a/Data/samples/Binding/Binding.progen b/Data/samples/Binding/Binding.progen index a3dd5dfddc..3d17f1e887 100644 --- a/Data/samples/Binding/Binding.progen +++ b/Data/samples/Binding/Binding.progen @@ -6,5 +6,5 @@ vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\src;..\\..\\..\\Data\\SQLite\\include +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/samples/Binding/Binding_vs160.vcxproj b/Data/samples/Binding/Binding_vs160.vcxproj index feb0a75d45..5f63a84fe8 100644 --- a/Data/samples/Binding/Binding_vs160.vcxproj +++ b/Data/samples/Binding/Binding_vs160.vcxproj @@ -235,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/Binding/Binding_vs170.vcxproj b/Data/samples/Binding/Binding_vs170.vcxproj index 9a6fd0337b..bd6a2d0071 100644 --- a/Data/samples/Binding/Binding_vs170.vcxproj +++ b/Data/samples/Binding/Binding_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -379,7 +379,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -410,7 +410,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -446,7 +446,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -477,7 +477,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -513,7 +513,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -544,7 +544,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -580,7 +580,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -611,7 +611,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -647,7 +647,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -678,7 +678,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -714,7 +714,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -745,7 +745,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -781,7 +781,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -812,7 +812,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -848,7 +848,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -879,7 +879,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -915,7 +915,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/RecordSet/RecordSet.progen b/Data/samples/RecordSet/RecordSet.progen index a3dd5dfddc..3d17f1e887 100644 --- a/Data/samples/RecordSet/RecordSet.progen +++ b/Data/samples/RecordSet/RecordSet.progen @@ -6,5 +6,5 @@ vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\src;..\\..\\..\\Data\\SQLite\\include +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/samples/RecordSet/RecordSet_vs160.vcxproj b/Data/samples/RecordSet/RecordSet_vs160.vcxproj index 05a06154c6..ef1dca08ec 100644 --- a/Data/samples/RecordSet/RecordSet_vs160.vcxproj +++ b/Data/samples/RecordSet/RecordSet_vs160.vcxproj @@ -235,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/RecordSet/RecordSet_vs170.vcxproj b/Data/samples/RecordSet/RecordSet_vs170.vcxproj index 580f58f9ce..08f11314a4 100644 --- a/Data/samples/RecordSet/RecordSet_vs170.vcxproj +++ b/Data/samples/RecordSet/RecordSet_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -379,7 +379,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -410,7 +410,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -446,7 +446,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -477,7 +477,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -513,7 +513,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -544,7 +544,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -580,7 +580,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -611,7 +611,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -647,7 +647,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -678,7 +678,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -714,7 +714,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -745,7 +745,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -781,7 +781,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -812,7 +812,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -848,7 +848,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -879,7 +879,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -915,7 +915,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/RowFormatter/RowFormatter.progen b/Data/samples/RowFormatter/RowFormatter.progen index a3dd5dfddc..3d17f1e887 100644 --- a/Data/samples/RowFormatter/RowFormatter.progen +++ b/Data/samples/RowFormatter/RowFormatter.progen @@ -6,5 +6,5 @@ vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\src;..\\..\\..\\Data\\SQLite\\include +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj b/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj index 687b4b2494..5e6ad3f2f2 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj +++ b/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj @@ -235,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj b/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj index 2517ce024a..42112adae8 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj +++ b/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -379,7 +379,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -410,7 +410,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -446,7 +446,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -477,7 +477,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -513,7 +513,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -544,7 +544,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -580,7 +580,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -611,7 +611,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -647,7 +647,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -678,7 +678,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -714,7 +714,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -745,7 +745,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -781,7 +781,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -812,7 +812,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -848,7 +848,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -879,7 +879,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -915,7 +915,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/Tuple/Tuple.progen b/Data/samples/Tuple/Tuple.progen index a3dd5dfddc..3d17f1e887 100644 --- a/Data/samples/Tuple/Tuple.progen +++ b/Data/samples/Tuple/Tuple.progen @@ -6,5 +6,5 @@ vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\src;..\\..\\..\\Data\\SQLite\\include +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/samples/Tuple/Tuple_vs160.vcxproj b/Data/samples/Tuple/Tuple_vs160.vcxproj index ddf3aa8c3e..55ddb33b4e 100644 --- a/Data/samples/Tuple/Tuple_vs160.vcxproj +++ b/Data/samples/Tuple/Tuple_vs160.vcxproj @@ -235,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/Tuple/Tuple_vs170.vcxproj b/Data/samples/Tuple/Tuple_vs170.vcxproj index 91ec3a2a35..32c4718efd 100644 --- a/Data/samples/Tuple/Tuple_vs170.vcxproj +++ b/Data/samples/Tuple/Tuple_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -379,7 +379,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -410,7 +410,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -446,7 +446,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -477,7 +477,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -513,7 +513,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -544,7 +544,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -580,7 +580,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -611,7 +611,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -647,7 +647,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -678,7 +678,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -714,7 +714,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -745,7 +745,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -781,7 +781,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -812,7 +812,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -848,7 +848,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -879,7 +879,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -915,7 +915,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/TypeHandler/TypeHandler.progen b/Data/samples/TypeHandler/TypeHandler.progen index 96965a6ce9..ca2cc01c4d 100644 --- a/Data/samples/TypeHandler/TypeHandler.progen +++ b/Data/samples/TypeHandler/TypeHandler.progen @@ -6,5 +6,5 @@ vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\src;..\\..\\..\\Data\\SQLite\\include +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj b/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj index 13e837f9d5..5be4b88aeb 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj +++ b/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj @@ -235,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj b/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj index bbb95405cd..c618031dc5 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj +++ b/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -379,7 +379,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -410,7 +410,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -446,7 +446,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -477,7 +477,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -513,7 +513,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -544,7 +544,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -580,7 +580,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -611,7 +611,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -647,7 +647,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -678,7 +678,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -714,7 +714,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -745,7 +745,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -781,7 +781,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -812,7 +812,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -848,7 +848,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -879,7 +879,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -915,7 +915,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/WebNotifier/WebNotifier.progen b/Data/samples/WebNotifier/WebNotifier.progen index 7d8738bb13..d3a2dbca0b 100644 --- a/Data/samples/WebNotifier/WebNotifier.progen +++ b/Data/samples/WebNotifier/WebNotifier.progen @@ -6,5 +6,5 @@ vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\src;..\\..\\..\\Data\\SQLite\\include;..\\..\\..\\Net\\include +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include;..\\..\\..\\Net\\include vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib diff --git a/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj b/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj index ae6764c50f..33e4a1dc0f 100644 --- a/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj +++ b/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj @@ -235,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj b/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj index 79b1661936..4fd1fc901b 100644 --- a/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj +++ b/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -379,7 +379,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -410,7 +410,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -446,7 +446,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -477,7 +477,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -513,7 +513,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -544,7 +544,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -580,7 +580,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -611,7 +611,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -647,7 +647,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -678,7 +678,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -714,7 +714,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -745,7 +745,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -781,7 +781,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -812,7 +812,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -848,7 +848,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -879,7 +879,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -915,7 +915,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/src/Statement.cpp b/Data/src/Statement.cpp index 29c7e294db..0546b05247 100644 --- a/Data/src/Statement.cpp +++ b/Data/src/Statement.cpp @@ -12,6 +12,9 @@ // +#ifndef POCO_DATA_NO_SQL_PARSER +#include "SQLParser.h" +#endif #include "Poco/Data/Statement.h" #include "Poco/Data/DataException.h" #include "Poco/Data/Extraction.h" @@ -193,14 +196,15 @@ Optional Statement::parse() #ifndef POCO_DATA_NO_SQL_PARSER -bool Statement::isType(Parser::StatementType type) const +bool Statement::isType(unsigned int type) const { + const auto st = static_cast(type); std::size_t sz = _pParseResult->size(); if (sz) { for (int i = 0; i < sz; ++i) { - if (_pParseResult->getStatement(i)->type() != type) + if (_pParseResult->getStatement(i)->type() != st) return false; } return true; @@ -209,19 +213,128 @@ bool Statement::isType(Parser::StatementType type) const } -bool Statement::hasType(Parser::StatementType type) const +bool Statement::hasType(unsigned int type) const { + const auto st = static_cast(type); for (int i = 0; i < _pParseResult->size(); ++i) { - if (_pParseResult->getStatement(i)->type() == type) + if (_pParseResult->getStatement(i)->type() == st) return true; } return false; } + #endif // POCO_DATA_NO_SQL_PARSER +const std::string& Statement::parseError() +{ +#ifdef POCO_DATA_NO_SQL_PARSER + static std::string empty; + return empty; +#else + return _parseError; +#endif +} + + +Optional Statement::isSelect() const +{ +#ifndef POCO_DATA_NO_SQL_PARSER + if (_pImpl->session().shouldParse()) + return isType(Parser::StatementType::kStmtSelect); + else return Optional(); +#else + return Optional(); +#endif +} + + +Optional Statement::isInsert() const +{ +#ifndef POCO_DATA_NO_SQL_PARSER + if (_pImpl->session().shouldParse()) + return isType(Parser::StatementType::kStmtInsert); + else return Optional(); +#else + return Optional(); +#endif +} + + +Optional Statement::isUpdate() const +{ +#ifndef POCO_DATA_NO_SQL_PARSER + if (_pImpl->session().shouldParse()) + return isType(Parser::StatementType::kStmtUpdate); + else return Optional(); +#else + return Optional(); +#endif +} + + +Optional Statement::isDelete() const +{ +#ifndef POCO_DATA_NO_SQL_PARSER + if (_pImpl->session().shouldParse()) + return isType(Parser::StatementType::kStmtDelete); + else return Optional(); +#else + return Optional(); +#endif +} + + +Optional Statement::hasSelect() const +{ +#ifndef POCO_DATA_NO_SQL_PARSER + if (_pImpl->session().shouldParse()) + return hasType(Parser::StatementType::kStmtSelect); + else return Optional(); +#else + return Optional(); +#endif +} + + +Optional Statement::hasInsert() const +{ +#ifndef POCO_DATA_NO_SQL_PARSER + if (_pImpl->session().shouldParse()) + return hasType(Parser::StatementType::kStmtInsert); + else return Optional(); +#else + return Optional(); +#endif +} + + +Optional Statement::hasUpdate() const +{ +#ifndef POCO_DATA_NO_SQL_PARSER + if (_pImpl->session().shouldParse()) + return hasType(Parser::StatementType::kStmtUpdate); + else return Optional(); +#else + return Optional(); +#endif +} + + +Optional Statement::hasDelete() const +{ +#ifndef POCO_DATA_NO_SQL_PARSER + if (_pImpl->session().shouldParse()) + return hasType(Parser::StatementType::kStmtDelete); + else return Optional(); +#else + return Optional(); +#endif +} + + void Statement::formatQuery() { if (_arguments.size()) diff --git a/Data/testsuite/CMakeLists.txt b/Data/testsuite/CMakeLists.txt index af3119ef1e..79d6e7353d 100644 --- a/Data/testsuite/CMakeLists.txt +++ b/Data/testsuite/CMakeLists.txt @@ -28,4 +28,11 @@ else() endif() target_link_libraries(Data-testrunner PUBLIC Poco::DataTest Poco::Data CppUnit) +if(NOT POCO_DATA_NO_SQL_PARSER) + target_include_directories(Data-testrunner + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser/src + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser + ) +endif() + add_subdirectory(DataTest) diff --git a/Data/testsuite/DataTest/DataTest.progen b/Data/testsuite/DataTest/DataTest.progen index a59d852624..4afcf6f090 100644 --- a/Data/testsuite/DataTest/DataTest.progen +++ b/Data/testsuite/DataTest/DataTest.progen @@ -8,10 +8,8 @@ vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -# TODO, for now we can just send cpp std via AdditionalOptions (see below) -#vc.project.compiler.std.cpp=stdcpp17 -#vc.project.compiler.std.c=stdc11 -vc.project.compiler.include = .\\src;${vc.project.pocobase}\\CppUnit\\include;${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\Data\\src;${vc.project.pocobase}\\Foundation\\include +vc.project.compiler.include = ${vc.project.pocobase}\\SQLParser;${vc.project.pocobase}\\SQLParser\\src;${vc.project.pocobase}\\CppUnit\\include;\ +${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\Data\\src;${vc.project.pocobase}\\Foundation\\include vc.project.compiler.defines = vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS;SQLParser_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} diff --git a/Data/testsuite/DataTest/DataTest_vs160.vcxproj b/Data/testsuite/DataTest/DataTest_vs160.vcxproj index 47ab9627b6..496803f71f 100644 --- a/Data/testsuite/DataTest/DataTest_vs160.vcxproj +++ b/Data/testsuite/DataTest/DataTest_vs160.vcxproj @@ -227,7 +227,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -261,7 +261,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -291,7 +291,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -319,7 +319,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -341,7 +341,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -369,7 +369,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -392,7 +392,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -426,7 +426,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -456,7 +456,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -484,7 +484,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -506,7 +506,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -534,7 +534,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/testsuite/DataTest/DataTest_vs170.vcxproj b/Data/testsuite/DataTest/DataTest_vs170.vcxproj index 7f9b4389c2..4a0bf04d60 100644 --- a/Data/testsuite/DataTest/DataTest_vs170.vcxproj +++ b/Data/testsuite/DataTest/DataTest_vs170.vcxproj @@ -331,7 +331,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -368,7 +368,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -401,7 +401,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -431,7 +431,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -456,7 +456,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -486,7 +486,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -511,7 +511,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -548,7 +548,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -581,7 +581,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -611,7 +611,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -636,7 +636,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -666,7 +666,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -691,7 +691,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -728,7 +728,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -761,7 +761,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -791,7 +791,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -816,7 +816,7 @@ Disabled - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -846,7 +846,7 @@ true Speed true - .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/testsuite/DataTest/Makefile b/Data/testsuite/DataTest/Makefile index 61a309c7b6..e84fc24546 100644 --- a/Data/testsuite/DataTest/Makefile +++ b/Data/testsuite/DataTest/Makefile @@ -11,6 +11,6 @@ objects = SQLExecutor target = PocoDataTest target_version = 1 target_libs = PocoData PocoFoundation CppUnit -target_includes = $(POCO_BASE)/Data/src $(POCO_BASE)/Data/testsuite/DataTest/include +target_includes = $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src $(POCO_BASE)/Data/testsuite/DataTest/include include $(POCO_BASE)/build/rules/lib diff --git a/Data/testsuite/Makefile-testrunner b/Data/testsuite/Makefile-testrunner index 9964afe64d..4907edc384 100644 --- a/Data/testsuite/Makefile-testrunner +++ b/Data/testsuite/Makefile-testrunner @@ -21,7 +21,7 @@ objects = DataTestSuite Driver \ target_includes = $(POCO_BASE)/Data/testsuite/include ifndef POCO_DATA_NO_SQL_PARSER objects += SQLParserTest - target_includes += $(POCO_BASE)/Data/src + target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src endif target = testrunner diff --git a/Data/testsuite/TestSuite.progen b/Data/testsuite/TestSuite.progen index bea49bc184..e5e1533dad 100644 --- a/Data/testsuite/TestSuite.progen +++ b/Data/testsuite/TestSuite.progen @@ -6,9 +6,6 @@ vc.project.pocobase = ..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj -# TODO, for now we can just send cpp std via AdditionalOptions (see below) -#vc.project.compiler.std.cpp=stdcpp17 -#vc.project.compiler.std.c=stdc11 vc.project.compiler.additionalOptions = /Zc:__cplusplus -vc.project.compiler.include = ..\\src;..\\..\\Foundation\\include +vc.project.compiler.include = ..\\SqlParser;..\\SqlParser\\src;..\\..\\Foundation\\include vc.project.linker.dependencies.Win32 = iphlpapi.lib diff --git a/Data/testsuite/TestSuite_vs170.vcxproj b/Data/testsuite/TestSuite_vs170.vcxproj index 84b9b1a531..498f42277f 100644 --- a/Data/testsuite/TestSuite_vs170.vcxproj +++ b/Data/testsuite/TestSuite_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -380,7 +380,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -412,7 +412,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -449,7 +449,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -481,7 +481,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -518,7 +518,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -550,7 +550,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -587,7 +587,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -619,7 +619,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -656,7 +656,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -688,7 +688,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -725,7 +725,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -757,7 +757,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -794,7 +794,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -826,7 +826,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -863,7 +863,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -895,7 +895,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -932,7 +932,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/testsuite/TestSuite_vs170.vcxproj.filters b/Data/testsuite/TestSuite_vs170.vcxproj.filters index b4898c2c66..9c98b1403c 100644 --- a/Data/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,55 +2,55 @@ - {eb163d66-4f6f-42de-a04e-52e38dfb9225} + {2d95d7a3-3de5-4536-b35d-73126427acde} - {b463247e-94f4-43c7-872f-7668fbd733b8} + {1be5b99c-df18-4cf6-864c-4dfff3baace1} - {da33cba1-cbb5-4ba3-ab34-85e43ab42f82} + {dac6e4c4-bf63-44b7-a361-e52b028d8729} - {ef265d31-0949-467d-973a-c1f09e433897} + {41739753-7509-4581-bc29-dcbd1d2c2b6d} - {3d13feb6-806a-4eb4-8b46-c355dc1cc571} + {a4d172ec-3e50-4146-8ba6-91b5527eefd0} - {da4e4535-7278-4c9e-b4c0-d056f7e33f27} + {d252092c-e433-431a-9237-88a3f9a0aa92} - {16b4ea46-09ae-4c53-9037-2a7cd06b5296} + {8a7ff23d-a28d-4dd0-afd9-f60b5b8f337a} - {fe4a83c2-964c-4298-99f0-404b648ff97f} + {867d2910-998f-4057-82b4-b65bbcb1b6b9} - {6b1d9cf8-1073-4412-8255-037c48829507} + {5693e2c5-1245-4cbe-953d-57f8e396d0d1} - {8194cc84-8a37-4dd6-94c7-7c469eeb4aa6} + {9b5cdfa0-e245-4da8-b190-6699d839b8b7} - {1cdf3a0d-7bf6-44fd-b651-3e1a4311c6d6} + {9fe6fa0d-437f-4bda-af9a-bcab22e9070e} - {3b4ca634-cf77-419c-8f6b-a7923d3ce3eb} + {1437295f-7705-4bd6-bc74-50811f065598} - {58df62f8-9bfe-4849-9e2e-6888973db2c5} + {5a8b7cd1-b39c-497c-a84f-092ce8a2a7a9} - {06862e3d-b7dc-42fb-a498-cf483fd5235a} + {8f9d6234-d59f-45c5-9272-ee297d9529c6} - {c5a9408f-0a19-400c-a269-129ab41fea51} + {4339971d-89a1-42e5-8572-3c8be078b693} - {f27b7199-f2fa-48be-b1a6-9bf7294ca2d9} + {06452f5d-7f36-4d95-b1de-2c35381751ef} - {9ab4a54c-2ad7-48f7-b476-dee9bb5a27d8} + {12079bde-b58f-46ef-8b78-e9479341c660} diff --git a/Data/testsuite/src/DataTest.cpp b/Data/testsuite/src/DataTest.cpp index 8a20b419cb..fef722b547 100644 --- a/Data/testsuite/src/DataTest.cpp +++ b/Data/testsuite/src/DataTest.cpp @@ -206,11 +206,11 @@ void DataTest::testFeatures() assertTrue (!sess.getFeature("forceEmptyString")); assertTrue (sess.hasFeature("sqlParse")); - assertTrue (sess.getFeature("sqlParse")); - sess.setFeature("sqlParse", false); - assertTrue (!sess.getFeature("sqlParse")); + assertFalse (sess.getFeature("sqlParse")); sess.setFeature("sqlParse", true); assertTrue (sess.getFeature("sqlParse")); + sess.setFeature("sqlParse", false); + assertFalse (sess.getFeature("sqlParse")); assertTrue (sess.hasFeature("autoCommit")); assertTrue (sess.getFeature("autoCommit")); @@ -1498,6 +1498,10 @@ void DataTest::testSQLParse() sess.setFeature("autoCommit", false); assertTrue (!sess.getFeature("autoCommit")); + assertFalse (sess.getFeature("sqlParse")); + sess.setFeature("sqlParse", true); + assertTrue (sess.getFeature("sqlParse")); + Statement stmt = (sess << "SELECT %s%c%s,%d,%u,%f,%s FROM Person WHERE Name LIKE 'Simp%%'", "'",'a',"'",-1, 1u, 1.5, "42", now); diff --git a/Data/testsuite/src/SQLParserTest.cpp b/Data/testsuite/src/SQLParserTest.cpp index 8914826a82..49416ad200 100644 --- a/Data/testsuite/src/SQLParserTest.cpp +++ b/Data/testsuite/src/SQLParserTest.cpp @@ -9,13 +9,21 @@ #include "SQLParserTest.h" + +#ifndef POCO_DATA_NO_SQL_PARSER + #include "CppUnit/TestCaller.h" #include "CppUnit/TestSuite.h" #include +#include "SQLParser.h" -#ifndef POCO_DATA_NO_SQL_PARSER -#include "Poco/Data/SQLParser.h" +namespace Poco { +namespace Data { + +namespace Parser = hsql; // namespace Poco::Data::Parser + +}} using namespace Poco::Data::Parser; diff --git a/Encodings/Encodings_vs160.vcxproj b/Encodings/Encodings_vs160.vcxproj index 8af93886fb..6697c495c7 100644 --- a/Encodings/Encodings_vs160.vcxproj +++ b/Encodings/Encodings_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 Encodings {D7AAB91A-9AB8-457D-A329-02D1FA47CB7E} Encodings @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoEncodingsd PocoEncodingsmdd PocoEncodingsmtd @@ -240,6 +241,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\bin\PocoEncodingsd.dll @@ -272,6 +275,8 @@ Default true + stdcpp17 + stdc11 ..\bin\PocoEncodings.dll @@ -303,6 +308,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoEncodingsmtd.lib @@ -328,6 +335,8 @@ Default true + stdcpp17 + stdc11 ..\lib\PocoEncodingsmt.lib @@ -351,6 +360,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoEncodingsmdd.lib @@ -377,6 +388,8 @@ Default true + stdcpp17 + stdc11 ..\lib\PocoEncodingsmd.lib @@ -399,6 +412,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\bin64\PocoEncodings64d.dll @@ -431,6 +446,8 @@ Default true + stdcpp17 + stdc11 ..\bin64\PocoEncodings64.dll @@ -462,6 +479,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoEncodingsmtd.lib @@ -487,6 +506,8 @@ Default true + stdcpp17 + stdc11 ..\lib64\PocoEncodingsmt.lib @@ -510,6 +531,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoEncodingsmdd.lib @@ -535,6 +558,8 @@ Default true + stdcpp17 + stdc11 ..\lib64\PocoEncodingsmd.lib @@ -577,99 +602,163 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Encodings/Encodings_vs160.vcxproj.filters b/Encodings/Encodings_vs160.vcxproj.filters index 19648d7347..f12138c595 100644 --- a/Encodings/Encodings_vs160.vcxproj.filters +++ b/Encodings/Encodings_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {55103894-3f7d-468d-8f72-02dfb1f682c4} + {c15768fc-708f-4d0b-a555-4fe5482bc8d4} - {8309e362-b466-4aaf-8e25-bdb584f77382} + {1272131b-56f1-445c-b440-264342815032} - {fbc64e7d-d8ff-43a9-86e1-9193e72d9317} + {a53c22e2-a622-4e4f-9470-7580a30f9415} diff --git a/Encodings/Encodings_vs170.vcxproj.filters b/Encodings/Encodings_vs170.vcxproj.filters index fda1ba6bf8..c72befa1ff 100644 --- a/Encodings/Encodings_vs170.vcxproj.filters +++ b/Encodings/Encodings_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {faa93394-b756-435b-9a06-0fed19badbbe} + {5e7cb9a9-a1d1-4be0-825e-5167afe689d7} - {e0d05a7d-2c4d-4f65-85b4-4314086035bf} + {5c9c20dc-87cd-4647-a4ec-cc24e3a1bb11} - {0cc01621-1367-4f74-a521-6bf563c6665a} + {72db566e-b1f8-4622-a480-2ffc9b6c6065} diff --git a/JSON/JSON_vs160.vcxproj b/JSON/JSON_vs160.vcxproj index 82899590cb..5a33ed50f9 100644 --- a/JSON/JSON_vs160.vcxproj +++ b/JSON/JSON_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 JSON {0E7FE914-0690-3EB4-9119-93A97CC97741} JSON @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoJSONd PocoJSONmdd PocoJSONmtd @@ -239,7 +240,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoJSONd.dll @@ -271,7 +275,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoJSON.dll @@ -302,7 +309,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJSONmtd.lib @@ -327,7 +337,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJSONmt.lib @@ -350,7 +363,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJSONmdd.lib @@ -376,7 +392,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJSONmd.lib @@ -398,7 +417,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoJSON64d.dll @@ -430,7 +452,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoJSON64.dll @@ -461,7 +486,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJSONmtd.lib @@ -486,7 +514,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJSONmt.lib @@ -509,7 +540,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJSONmdd.lib @@ -534,7 +568,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJSONmd.lib @@ -543,24 +580,38 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true @@ -588,21 +639,33 @@ true CompileAsCpp true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/JSON/JSON_vs160.vcxproj.filters b/JSON/JSON_vs160.vcxproj.filters index 208c9ad925..93237343ed 100644 --- a/JSON/JSON_vs160.vcxproj.filters +++ b/JSON/JSON_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {e44965d4-fac6-44c5-bd9f-9d53afa5ec72} + {71bcfd62-4793-41c9-8c35-416c2154e8e5} - {7215ea24-3f21-439f-9919-0366bb01330a} + {9a161e20-adcc-49d6-8149-d8bae41992e0} diff --git a/JSON/JSON_vs170.vcxproj.filters b/JSON/JSON_vs170.vcxproj.filters index de3ef1a5d0..21d18d54c4 100644 --- a/JSON/JSON_vs170.vcxproj.filters +++ b/JSON/JSON_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {b4ca54b7-8995-4245-84eb-fd8649736ca6} + {0d04a5d6-9439-4b50-8b1a-23f14b10b711} - {798deb3f-247e-47f5-ac92-86dd30aaf7a7} + {5618c8ec-9722-4d59-88be-6e79c2061801} diff --git a/JWT/JWT_vs160.vcxproj b/JWT/JWT_vs160.vcxproj index 69601edca2..e7413cdd49 100644 --- a/JWT/JWT_vs160.vcxproj +++ b/JWT/JWT_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 JWT {EFE871AE-A00F-4EB5-B816-FA316EAB9DA7} JWT @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoJWTd PocoJWTmdd PocoJWTmtd @@ -239,7 +240,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoJWTd.dll @@ -271,7 +275,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoJWT.dll @@ -302,7 +309,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJWTmtd.lib @@ -327,7 +337,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJWTmt.lib @@ -350,7 +363,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJWTmdd.lib @@ -376,7 +392,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJWTmd.lib @@ -398,7 +417,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoJWT64d.dll @@ -430,7 +452,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoJWT64.dll @@ -461,7 +486,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJWTmtd.lib @@ -486,7 +514,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJWTmt.lib @@ -509,7 +540,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJWTmdd.lib @@ -534,7 +568,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJWTmd.lib @@ -543,15 +580,23 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/JWT/JWT_vs160.vcxproj.filters b/JWT/JWT_vs160.vcxproj.filters index 4c76c14dc0..a8eb3d5efd 100644 --- a/JWT/JWT_vs160.vcxproj.filters +++ b/JWT/JWT_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {a66b4ed5-2cd4-4fc0-8ae0-7c8c7b37ff46} + {d85fe858-540b-457d-8e5e-f6a160ed7ab9} - {2493b33c-6121-4b51-b04e-b578582dea8f} + {72ad21f5-ade9-4f75-85ac-6326ff62a53f} diff --git a/JWT/JWT_vs170.vcxproj.filters b/JWT/JWT_vs170.vcxproj.filters index 2d5bd5d83d..3581087c20 100644 --- a/JWT/JWT_vs170.vcxproj.filters +++ b/JWT/JWT_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {99ea761a-eb19-49af-aa37-f0c29265845c} + {17f40ad0-87a9-4097-8694-dd74cdb883e4} - {98e7b8ac-808a-458d-83af-ad5de88c01d2} + {e25da310-5bc0-48a8-b315-523b046ef71b} diff --git a/Makefile b/Makefile index 35e4cb3570..dd714a4fa8 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ all: libexecs tests samples INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) COMPONENTS = Foundation Encodings XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Data/PostgreSQL ActiveRecord ActiveRecord/Compiler Zip PageCompiler PageCompiler/File2Page JWT CppParser PDF MongoDB Redis Prometheus -cppunit: Foundation-libexec +cppunit: $(MAKE) -C $(POCO_BASE)/CppUnit CppUnit-clean: diff --git a/MongoDB/MongoDB_vs160.vcxproj b/MongoDB/MongoDB_vs160.vcxproj index 8a6dfb77ca..e9c59eec7b 100644 --- a/MongoDB/MongoDB_vs160.vcxproj +++ b/MongoDB/MongoDB_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 MongoDB {4FF2F34B-7F37-3ACD-AFBC-F21D6D426199} MongoDB @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoMongoDBd PocoMongoDBmdd PocoMongoDBmtd @@ -239,7 +240,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoMongoDBd.dll @@ -271,7 +275,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoMongoDB.dll @@ -302,7 +309,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoMongoDBmtd.lib @@ -327,7 +337,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoMongoDBmt.lib @@ -350,7 +363,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoMongoDBmdd.lib @@ -376,7 +392,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoMongoDBmd.lib @@ -398,7 +417,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoMongoDB64d.dll @@ -430,7 +452,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoMongoDB64.dll @@ -461,7 +486,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoMongoDBmtd.lib @@ -486,7 +514,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoMongoDBmt.lib @@ -509,7 +540,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoMongoDBmdd.lib @@ -534,7 +568,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoMongoDBmd.lib @@ -543,72 +580,118 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true - - - true - - - true + stdcpp17 + stdc11 @@ -637,8 +720,6 @@ - - diff --git a/MongoDB/MongoDB_vs160.vcxproj.filters b/MongoDB/MongoDB_vs160.vcxproj.filters index 286317dd7d..975fd79cb0 100644 --- a/MongoDB/MongoDB_vs160.vcxproj.filters +++ b/MongoDB/MongoDB_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {79291374-e43c-410c-9abb-27856b414425} + {fee64320-b7d4-4848-af58-024236e8152a} - {b5f2e9d3-009b-4027-b9c2-043999b8ec92} + {55eff4b2-68f6-4297-898b-ee3a0106701c} @@ -54,6 +54,12 @@ Source Files + + Source Files + + + Source Files + Source Files diff --git a/MongoDB/MongoDB_vs170.vcxproj.filters b/MongoDB/MongoDB_vs170.vcxproj.filters index f615f265d0..021eb99097 100644 --- a/MongoDB/MongoDB_vs170.vcxproj.filters +++ b/MongoDB/MongoDB_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {f5a4eaef-7b91-4fcd-a0cc-abf16751ee24} + {e687701a-4324-4099-a863-e409f4b92b3e} - {e77da2cc-d3b2-48dc-b148-9b2de0c25acc} + {8488969c-4d96-49be-bc25-4263be678ebc} diff --git a/Net/Net_vs160.vcxproj b/Net/Net_vs160.vcxproj index d38ca5890a..da3cd636e4 100644 --- a/Net/Net_vs160.vcxproj +++ b/Net/Net_vs160.vcxproj @@ -1,5 +1,5 @@ - - + + debug_shared @@ -51,115 +51,126 @@ + 17.0 Net {B057A1FE-09F7-465E-B8B5-E1B659051D76} Net Win32Proj - 10.0 - + StaticLibrary - v142 MultiByte + v142 StaticLibrary - v142 MultiByte + v142 StaticLibrary - v142 MultiByte + v142 StaticLibrary - v142 MultiByte + v142 DynamicLibrary - v142 MultiByte + v142 DynamicLibrary - v142 MultiByte + v142 StaticLibrary - v142 MultiByte + v142 StaticLibrary - v142 MultiByte + v142 StaticLibrary - v142 MultiByte + v142 StaticLibrary - v142 MultiByte + v142 DynamicLibrary - v142 MultiByte + v142 DynamicLibrary - v142 MultiByte + v142 - - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - <_ProjectFileVersion>16.0.32602.291 + <_ProjectFileVersion>17.0.34322.80 + PocoNetd + PocoNetmdd + PocoNetmtd + PocoNet + PocoNetmd + PocoNetmt + PocoNet64d + PocoNetmdd + PocoNetmtd + PocoNet64 + PocoNetmd + PocoNetmt ..\bin\ @@ -191,7 +202,6 @@ ..\bin64\ obj64\Net\$(Configuration)\ true - Poco$(ProjectName)64d ..\bin64\ @@ -201,7 +211,6 @@ ..\lib64\ obj64\Net\$(Configuration)\ - Poco$(ProjectName)64d ..\lib64\ @@ -210,7 +219,6 @@ ..\lib64\ obj64\Net\$(Configuration)\ - Poco$(ProjectName)64d ..\lib64\ @@ -228,11 +236,14 @@ true true true - + Level3 ProgramDatabase Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -261,11 +272,14 @@ true true true - + Level3 - + Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -292,12 +306,15 @@ true true true - + ..\lib\PocoNetmtd.pdb Level3 ProgramDatabase Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ..\lib\PocoNetmtd.lib @@ -318,11 +335,14 @@ true true true - + Level3 - + Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ..\lib\PocoNetmt.lib @@ -340,12 +360,15 @@ true true true - + ..\lib\PocoNetmdd.pdb Level3 ProgramDatabase Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ..\lib\PocoNetmdd.lib @@ -366,12 +389,15 @@ true true true - + ..\lib\PocoNetmd.pdb Level3 - + Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -390,11 +416,14 @@ true true true - + Level3 ProgramDatabase Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -423,11 +452,14 @@ true true true - + Level3 - + Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -454,12 +486,15 @@ true true true - + ..\lib64\PocoNetmtd.pdb Level3 ProgramDatabase Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ..\lib64\PocoNetmtd.lib @@ -480,11 +515,14 @@ true true true - + Level3 - + Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ..\lib64\PocoNetmt.lib @@ -502,12 +540,15 @@ true true true - + ..\lib64\PocoNetmdd.pdb Level3 ProgramDatabase Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ..\lib64\PocoNetmdd.lib @@ -528,244 +569,675 @@ true true true - + Level3 - + Default /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 ..\lib64\PocoNetmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + @@ -779,7 +1251,6 @@ true - - - - \ No newline at end of file + + + diff --git a/Net/Net_vs160.vcxproj.filters b/Net/Net_vs160.vcxproj.filters index 81b1dddee1..874e081709 100644 --- a/Net/Net_vs160.vcxproj.filters +++ b/Net/Net_vs160.vcxproj.filters @@ -2,166 +2,166 @@ - {f06d3212-fc62-4709-bd3c-095c79001249} + {1fcf95cc-188a-41b8-b24e-794397285fa5} - {af806f33-c17e-4d85-babf-da17a499bd65} + {2d882d99-e40a-4396-9cce-4f8aaf342e1e} - {e057e5ff-35f6-4380-ab7a-cbbefd0da9cb} + {eb1dcb08-be2b-41fd-96e4-acb942c6b460} - {5563ebfe-5bac-419b-8894-4a66e06e1f4f} + {b2d363d9-43eb-4ba1-8f72-875e7bab5a05} - {7dedb440-dfed-4bc6-8fea-5c9f117c3808} + {9aa6756c-2b5a-4ea2-9633-a5c9cba8c8b4} - {d9805cd8-c8cf-448c-a017-7c55912e1b41} + {0da8dac7-4b24-4bc2-b5b2-d1553f8e7ecf} - {1c467b86-e839-465d-9623-a58c17f63f0d} + {942984c9-ebfb-4502-962c-e3f3d9ea58b9} - {1f28a347-0b31-41d0-85c5-0bee09d6d93c} + {06a33e9b-deb2-4d14-90b7-9d9666b0a272} - {07d498fd-94fb-4f5f-b152-56778b28c6eb} + {32a3e3bf-c789-4a0b-9f73-18aedb8fcfcf} - {4a1afd42-7315-4316-9dd5-7e8dd04da6e8} + {78ce2f83-3c7d-4176-a2df-5013a0a4536c} - {e03a720b-ab2d-4581-96ff-bd9880c2683f} + {48900136-77ed-415f-80cb-300f3ce80003} - {a0d686c9-9cb1-48c4-916c-1c4748d1c338} + {25c7566e-a315-4156-aa84-b8a8893f08f2} - {a7c09398-1351-415c-805c-c9042cd050aa} + {d1e068f9-546d-4fb4-892a-263881b22596} - {80c1c233-4275-4b11-99b7-09c236b67c59} + {ba666f1f-8ad2-48de-ac58-3f5880b21714} - {d9b0235d-2b80-488f-922f-f6e03db98e84} + {53795782-82d9-42ea-acf2-a08119553b06} - {d4605b22-8a3d-49e6-a706-87bdfbfb2704} + {eb3bd24c-7aa0-4042-b39b-38d5f01bdc26} - {4d91b6a0-8fcf-4494-8916-8b9508111954} + {65f48f86-912c-4488-97f8-4b32ccab8c79} - {41684471-d7fc-407b-8012-00fb92d90eae} + {1a37f639-f157-47c9-b9e0-c183d8357de4} - {cd73de9e-039d-40c8-bb20-51d3313eadfd} + {625137c0-82a0-47ca-8a55-3eecc61bea1f} - {bcc591d8-e663-40d9-8486-a64224ff6dc7} + {11d91a05-5e11-40f5-b5c8-ad3df84635fb} - {8a93a1a5-d2d3-44e7-bd58-e0d7cfe588aa} + {bdccdf62-dce5-4c46-9f80-4596b114dac0} - {47466b38-df77-458e-a23e-e0f2a6f595fc} + {fd75ab60-4cbf-4e43-a00f-8c8cdea685ee} - {55fa85f4-bf7c-48b1-97fd-515c5cd91b5a} + {b7f79795-fbb2-439c-8def-64a7e46bb178} - {d8a5c58a-e68e-4388-b67c-f66434b953dd} + {0e97c997-43f7-4a8b-8d53-5b0d52e7eb41} - {3ac122e8-9cca-4173-a62f-7790e5eb1a88} + {a79f4ef5-ac12-4b7c-9c4a-2d73304bdda9} - {a522f42b-9a2d-4a85-96da-a7577ab68981} + {e16e91d6-4224-484d-95c9-2ad57ca40b79} - {1dda1c74-3efc-4107-ba68-8e69b61bb10e} + {78a9eae0-54b2-449c-81dd-9fd5a16cd1e2} - {c5b0f415-f89a-4a16-b07b-7076ccefdf9d} + {84903cb4-9a9a-4255-bd80-49422998b2c8} - {6fd9d706-01b7-416e-ac7c-5997e052616d} + {47b04c1d-6327-4cc8-840f-3eb9072b2a12} - {53d75179-b04d-459e-a6ec-da60f1e71447} + {ce3da7d9-0751-42cb-be8f-57c11d6fbfc4} - {ea5a77e8-33ce-4075-8624-3d3310f49a95} + {9753e648-5ee9-4146-b77f-0e459591324d} - {7c0617c9-c950-45c2-aba1-0b84a3614792} + {0a93dffd-8c4a-4edb-abb8-a524b9cb40dd} - {39906fc4-02c7-4c8e-9247-06dbc0a391db} + {21410110-b4d6-4520-a6c4-e4bbf960ec04} - {c1be6a77-9aa7-4cd7-b865-7f6f2c0b656f} + {11fbb0f9-2587-4c5b-a898-507e0897d3da} - {86338a33-45fb-40d5-aa59-5163ab671cb9} + {8b1825fa-f807-4a18-92bc-9660c33680fb} - {44c6df98-6750-41ab-ba28-8ca03a558812} + {6116ecaa-8f26-48db-8c24-53d7b8d36b40} - {3c91096b-e7a3-4642-b307-74488aea9ba3} + {b0fd619d-3464-4781-a280-f857f8041ac0} - {38ad1945-f32d-4508-bf73-d9bf2fe10c0e} + {a6fea55d-728d-4a7a-b633-a51157180418} - {47018146-c9ca-4247-a1ff-1e6fb593529f} + {2d28d83b-b58b-41be-832b-e530fdf971e7} - {e8002af3-b8e2-4c07-b346-7a9e65aba60d} + {046f821c-907e-4a8f-a03c-3bfd7872448c} - {64a18bfc-e244-4657-a70c-9c2964bfb74f} + {3923d4a4-5c4c-4a2e-adf0-7ec7eef2dd03} - {fcb6ce80-0f9b-40fb-9a1b-df5fdd4b636b} + {656a3621-b2f5-45b1-b775-faa1a3b67fc9} - {f226bdc0-29fd-451e-ba41-f3f239ee78f7} + {0546832e-b113-458f-9db9-3db9e82fbb41} - {f03d8270-228d-4c30-a6d4-1e7ca0bcdbf0} + {d49b1cd1-508e-4479-ab85-a5ff79a4a8c7} - {46032695-fc6e-4cbd-8426-991a5d36729c} + {b610e037-00fd-4b22-b123-edbd7381029c} - {871f91e0-6027-4a8e-8c5f-8119745e01e0} + {015e1e81-4e41-49e3-98c0-fbdbd8b5cbd2} - {b7e70f4f-7148-4ee1-9466-6ba6cb8d0df1} + {f68ec3df-519c-4f17-ba65-94eb081a3828} - {aeadc00a-2263-47f9-9200-b7ce3da8696c} + {a567ae0c-641a-4a56-8161-f8404caab345} - {7ef2a491-cb68-46af-8727-25ce34dfc75e} + {61c54ff0-49c4-4fb9-9f7c-1f2f3e8bb753} - {0e9eca9c-18bc-4dee-8488-2a5a69390aa2} + {17cd6d4d-6687-40ca-9dac-d36110efcf64} - {0be52802-0903-4bbb-bbd4-9a96bd2b8696} + {2cf2bb9e-c4f6-4aec-8404-a792b1c5674f} - {91c08360-748f-4064-a5b3-51b5e75e533f} + {f5f349da-4441-4f01-9e2c-ee774168e0e3} - {463bba10-3193-4504-a03a-ec82af13e19d} + {0ea8ee82-a76c-4cfd-ad4e-4d570efc8b09} - {b8b0be99-dcda-4b16-bdda-29f96f5d23a9} + {0cfa6ff4-ffbf-4b4a-ba62-6451832772f3} diff --git a/Net/Net_vs170.vcxproj.filters b/Net/Net_vs170.vcxproj.filters index 389f958abd..e5c3c662de 100644 --- a/Net/Net_vs170.vcxproj.filters +++ b/Net/Net_vs170.vcxproj.filters @@ -2,166 +2,166 @@ - {807ff714-e183-4df3-9bcf-999f06de4b55} + {0f393581-fb6c-4d73-b811-19733a904d02} - {3abff93d-1752-42d9-be72-717f4d2eafd3} + {7d92a679-da95-4691-83af-f94a72380c8a} - {2a34e5e5-8e51-4df1-bc1d-72bef47656bd} + {fe6b7b86-3e2e-4ab6-afbf-f8f10456df57} - {39703b0c-6789-4197-9dfc-1b3ec95767d8} + {30fce044-fc3f-4bd9-824c-f412e5558e5b} - {e20271eb-bfc6-4aa3-b84d-e0a892da51ea} + {172b7d94-dc82-4905-8663-8e9206a6d123} - {85f5b169-a46f-4033-9ede-7f21f7f41844} + {4d5c961f-3a8f-42ed-9956-21935625c1d2} - {bb5e4b31-e1e6-4463-96fb-40dad19d890d} + {7eab4806-80e3-409b-8348-2c80be0f3524} - {5561f49c-32c1-4977-b73e-72acc18967c6} + {834ec475-9213-4b7d-b2bf-4766f4246d2c} - {ce1eda6c-182d-42c3-bc6e-f0e5a57bd910} + {cb796d62-dee6-45af-a7c0-5909769eaa5d} - {2a3cf08f-277c-44f4-b281-53a222589521} + {ec0de0ea-eaa7-4f65-8dc6-333ce7fb145c} - {f46011ae-51b0-4c75-94f2-75ce38a9c1f8} + {8323a82c-63f3-4049-b0b7-5e188fed5779} - {8e09bf51-43af-4927-a1f8-35fde03e31f9} + {c03b3059-5722-4ba7-9415-a316eb0b3461} - {a2585b09-952a-4846-85dc-7cef5d8e6316} + {d7e6310c-244d-4193-b178-9eff441ffaa5} - {ed0e694d-c54a-43db-86b1-b9cff1bca9e7} + {ce6e9655-8a4e-4aae-abda-e2ef4938355b} - {e0388610-bb32-4a05-9608-201c166cbd7a} + {ca423d03-073b-42e3-9363-0a065c086b43} - {3422fb59-7aaa-4418-bbd9-e02b6b0a89bf} + {c08c3294-ddc0-4fbc-9ec1-909766304402} - {96093a57-1ffc-45b3-97c7-54117dadf3a8} + {2c77b3b7-677f-4aef-9956-fce03b43fbba} - {42bcafa5-fa8b-43bb-83b2-b78856633103} + {d23f849f-cfb6-4747-aadb-1f6937fcf6ab} - {b6744e60-638e-49f2-82fd-a9c787d5fcb2} + {59c3213c-7398-4922-9786-0e45428cf090} - {0110954e-bf64-49bb-8ff3-3912f8a94ab0} + {57768490-3ad9-4baf-8323-04f5b0b37e1d} - {3326cd87-4134-405b-bc9b-560b18ef8c3d} + {29e894e3-a5c2-4ac0-9462-0f3cbf09a07e} - {c32b81d5-baff-45f9-aee4-3ce46a8491f2} + {88b9a471-6e74-4a30-8ddc-c6843a804fe9} - {9aa25ee3-479c-4bbb-8211-973459fa25e7} + {7bbd272c-91a7-4640-ab2b-5576d0aba1da} - {6cf2a4e9-ae34-432d-9472-50d6f34fa139} + {5b35ce48-7d42-4819-bb14-016c8cd08c1e} - {976530a3-79ab-46b9-877f-27c280f88bf5} + {c548a957-d077-4b1c-b52d-5faa7c116ff1} - {85a66838-8212-4638-b218-788b24cf6214} + {c7db860a-5743-4ec6-8a7a-8ebb4808d4b1} - {62b5a7ad-f566-4507-bcc2-65f553ac3bc2} + {2920f992-d22c-4802-8dfd-8f2a79506722} - {69a92687-4570-4f08-a82c-3e201cbc0df6} + {eadc8668-bfec-4b9a-b92c-1ce73161cf95} - {cf137793-887b-498a-a839-249fe20fa659} + {65e64bf1-3b11-4100-8ea8-2fe84d56c3b8} - {058d16f3-1c77-40f5-bed0-6ee39f6d69fc} + {d5462cff-09df-4808-92bc-54810b8900ae} - {07113e92-8e9d-4fd9-be0e-c8d1ee90b205} + {19667b40-77aa-487f-98e3-2bbee4bf3a48} - {a971c52d-e993-4a15-b467-0e24c9654d0a} + {bd35580c-2467-4381-872d-2efe9bb8722d} - {60591c89-e2f9-4a9d-8680-2bbe7f8166c5} + {24745bd5-81e6-4bb4-b1c6-97bfb3e30ed2} - {fbd4ef96-6fb6-4922-b3a6-6da9bc59fce2} + {06069587-0dde-4d10-bea7-5358b9ffbf97} - {e3c6e815-447f-44ab-bbfc-5971bb96ff53} + {8135fb8b-ef54-41ce-872b-ec34c1984051} - {b7970e66-2cc1-4f85-bcbe-1056f64510c4} + {b5d41b85-1f85-4256-b92e-98d010bef2ac} - {ec1ca999-4ce9-42e1-9462-1a85fe6d3d62} + {f85def03-7da6-4ce8-a11c-47e14067e360} - {c1905a95-4aaf-4a68-9951-d270e7c853fe} + {0f89a979-ac8f-4fd1-b8b6-427b7f2bd4e3} - {b06f281f-d37d-48c4-809a-cfd5475c3b2c} + {854476b2-23e2-43a1-af94-c5710c97bf51} - {2fd44bbc-34d8-445a-8f31-5aec62d27fd2} + {f35fa359-4531-479e-bf41-827bcfed2589} - {8bf4c3b6-de70-4762-b1ae-dcd299834636} + {202f25d8-c8d9-433d-a7a0-18239240101f} - {d851eca3-7aca-47a1-a082-558984aef491} + {8fe2f58d-56bc-4869-9eab-dd65dd0a14ca} - {9a6adb10-3c83-4c3e-a78c-bc842c3e728c} + {f22d77b3-7de7-45d6-9c82-c06f9673b44e} - {96b53209-6c12-41fd-ae10-744a156a0f41} + {9a20a6bc-9f47-4bcb-8b0a-39f524bc8e65} - {e14d9455-731e-4228-84e8-6e421e57e5df} + {1dd41c32-d00e-4c55-8645-c356aca4023b} - {bc05e2c6-07dd-46e4-911f-a83044012e0e} + {9c2d7a98-8398-42fc-a345-5278661dfb5b} - {ab9b6b24-5d69-41bf-ae73-0d081605207b} + {e1146a66-2ef9-4f82-8b0e-e80f2d8c91f9} - {eab59ba2-b014-4aa7-aa87-69e7223c221e} + {13a18171-b410-4c2f-9233-b70f7116faf3} - {4146679a-e4af-4d07-a76c-766c3d9b79f0} + {72cfa271-ffc8-49c9-b46c-34a920c74554} - {f185f3d3-c3bf-4745-9d51-fd14041bcc0e} + {a28c4870-c13c-4494-a100-21eca36e176e} - {d5a327e3-3145-436a-895a-ad2cc062dbf2} + {3eb5680d-25b9-45ee-a927-e0b32e712052} - {c6720f96-b33d-4936-872f-5a2576ea95c5} + {eb39586c-e344-404f-915f-5d65c6e433c7} - {aec6cc22-5394-4555-8474-b3f0c3b26e7f} + {579659c3-dd76-4375-ade8-423ead925e9e} - {7c3b8656-5cb5-4355-b2fc-936bc3c3114c} + {e3865012-ad03-49c4-b49e-0a3a653deaba} diff --git a/Net/include/Poco/Net/ParallelSocketAcceptor.h b/Net/include/Poco/Net/ParallelSocketAcceptor.h index ee6a140f36..97da2013f9 100644 --- a/Net/include/Poco/Net/ParallelSocketAcceptor.h +++ b/Net/include/Poco/Net/ParallelSocketAcceptor.h @@ -22,19 +22,10 @@ #include "Poco/Net/StreamSocket.h" #include "Poco/Net/ServerSocket.h" #include "Poco/Environment.h" -#include "Poco/NObserver.h" #include "Poco/SharedPtr.h" #include -using Poco::Net::Socket; -using Poco::Net::SocketReactor; -using Poco::Net::ServerSocket; -using Poco::Net::StreamSocket; -using Poco::NObserver; -using Poco::AutoPtr; - - namespace Poco { namespace Net { diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj index 6ec2e80388..a22ac92f9c 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 NetSSL_OpenSSL {5AECC55E-A469-11DA-8DA6-005056C00008} NetSSL_OpenSSL @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoNetSSLd PocoNetSSLmdd PocoNetSSLmtd @@ -239,7 +240,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -272,7 +276,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -304,7 +311,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLmtd.lib @@ -329,7 +339,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLmt.lib @@ -352,7 +365,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLmdd.lib @@ -378,7 +394,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -401,7 +420,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -434,7 +456,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -466,7 +491,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLmtd.lib @@ -491,7 +519,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLmt.lib @@ -514,7 +545,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLmdd.lib @@ -539,7 +573,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLmd.lib @@ -580,90 +617,148 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj.filters index 76bbaa439c..924ded6f0f 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj.filters @@ -2,49 +2,49 @@ - {a907450a-b497-4e1f-a21c-94a99e197c2d} + {610a5f1f-68a0-4ddf-9c35-77b28ef15e4e} - {93918e37-d134-42d7-b345-2e60ab41e1f9} + {a4341a68-e0f2-48e7-a66e-4f79874c865e} - {0a1bfd58-52a7-4c7d-b55d-4ed2d505056b} + {78cc6d1b-cb4c-4ce3-96e7-fc116d1a7ec7} - {9d771387-7041-4c75-acd4-3ba1a7ee1159} + {0c6e82d8-164a-4809-a20d-94577dc9a882} - {10a12d98-5377-4052-816a-c0b51bedcff2} + {07e9ff52-1e92-4eaf-8de1-d243188d6f63} - {15231b28-83ac-4cf7-9fd5-21e3332f7850} + {f8deb043-cdef-44f0-af20-b75b9c8a2928} - {c9510bba-ee39-4c5b-ab65-f5e007511540} + {8eb83285-e5ba-4416-9c64-67bc91b07bf1} - {313c058b-29ad-47dd-92ca-549a23920413} + {f7ff56d9-9a95-45e4-bba7-52da3d1c558c} - {0fa5153c-28be-4dbc-893f-d9d12147e0f4} + {b5e2ec2a-940a-4681-8a1a-d5053f39aba9} - {1c539a87-3151-4667-a766-db7a0eac4f0d} + {7ed7663a-a345-4f93-b172-8c8152c5e368} - {42493a3a-e40e-4ec0-829f-1b79acbe5156} + {5488d710-d058-4286-aeee-3540354d2111} - {e4e19c42-5e42-4e8e-a19d-bf13dcabdeb1} + {29c556b6-89e5-44b6-8dcc-b34867db82e5} - {ec69f65f-615a-4c71-86b4-9f2a78c07ecf} + {c8fd3ca2-0dbc-4f0d-a9d0-e86ebd762cf9} - {c710847c-203f-4940-901b-942d666967f6} + {ed41ca52-3fb1-447f-a239-5c1abf0fc108} - {24844a06-9949-446f-99cb-bdeed264e2cb} + {d9459a9e-473c-4960-b902-fc4e5c0e6c8c} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters index 06fafc9033..6e51be8ddf 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters @@ -2,49 +2,49 @@ - {73c9f951-b8c8-48ff-8692-75b8265a7b5f} + {80af7578-186a-472c-9dcf-2c2b869bd712} - {a9b8a66c-dcf3-4818-82d3-3ffeacf236bd} + {0275fcb3-6879-4e36-ba4d-18a2338f6799} - {aa25e56e-e2ee-463a-9254-6f72d98055b7} + {dd7dab3b-e2ad-4953-8b75-b828b460ecbc} - {9aa19c54-dabd-40c8-824f-fb5960969e06} + {e3fda0f9-4ace-4eea-ab85-036841e3b0cf} - {339923e3-8ad1-4507-86d5-14fa991a4022} + {d47af968-78e6-4fe4-b8f1-46869242b2a3} - {5fe53210-ac84-4ce4-8207-60f7fe03ee7d} + {3fad2a6f-d754-4a75-bbf9-5b2ec3f036cb} - {3bcd1b3f-9444-4fe2-b0c7-d7ba98084118} + {e1c12303-0459-4ffb-99a8-c0afb1c0b752} - {fb203413-9bd3-4666-9e6b-17bc254946be} + {a1c8a207-f17d-4519-8704-d45e70769064} - {e44aced8-c356-4072-af09-27319a2201b0} + {cab77a5e-f306-40bb-85a3-a20f0824f76b} - {0531bd60-2aa6-40b8-9501-8c63c6d62097} + {a7b6f111-b005-4b35-9c9e-35a3108237b3} - {9b1c9a40-a812-4155-b623-f05ba269c986} + {a7f480c0-5b2c-4100-b4b4-85fbb054cd00} - {03349be0-1387-4a00-9d7f-b5946c882909} + {8923e8f4-edb2-4e1f-a73b-441c6eec3ff7} - {dd130327-f2c2-431e-bb0a-d1d36bf021fe} + {c20480f2-2707-47de-ba34-77ee87349631} - {41fc35d3-b992-4451-a927-4b4f71c34923} + {52583bc6-77ed-4a85-9e76-91620d06c817} - {5d30681e-7d75-4766-8f7c-4143ebdb1320} + {daa86ff8-3c83-4b0f-9a0f-5985b5728dc8} diff --git a/NetSSL_Win/NetSSL_Win_vs160.vcxproj b/NetSSL_Win/NetSSL_Win_vs160.vcxproj index 944b11b4b4..1b43b7382a 100644 --- a/NetSSL_Win/NetSSL_Win_vs160.vcxproj +++ b/NetSSL_Win/NetSSL_Win_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 NetSSL_Win {A097DC74-A5FC-4A0B-804E-B18892426E77} NetSSL_Win @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoNetSSLWind PocoNetSSLWinmdd PocoNetSSLWinmtd @@ -239,7 +240,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -272,7 +276,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -304,7 +311,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLWinmtd.lib @@ -329,7 +339,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLWinmt.lib @@ -352,7 +365,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLWinmdd.lib @@ -378,7 +394,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -401,7 +420,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -434,7 +456,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -466,7 +491,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLWinmtd.lib @@ -491,7 +519,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLWinmt.lib @@ -514,7 +545,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLWinmdd.lib @@ -539,7 +573,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLWinmd.lib @@ -579,84 +616,138 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/NetSSL_Win/NetSSL_Win_vs160.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs160.vcxproj.filters index d9c4138e1f..2a8408ad7f 100644 --- a/NetSSL_Win/NetSSL_Win_vs160.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs160.vcxproj.filters @@ -2,40 +2,40 @@ - {5d488fad-ffca-4cf2-904e-1a2b478d294f} + {110f2918-a919-4da4-b31e-be4a87a446bb} - {dc5e9153-908d-48db-9ee2-714ee8fd5d8c} + {4ad1c5e4-3a8d-4f43-9bf8-8e7855a24eb5} - {e5cbc2f6-8bde-48d0-9105-e3989ec8222e} + {2e3e1710-5bcd-43c8-b61d-3fd8cdcc7ffd} - {41fb1be1-c990-4ab2-b592-85f1c131310e} + {05123d85-0b35-4f00-a833-613c65ef3345} - {bdae5611-47e0-4130-b981-72b2ceaa1747} + {5d92651a-32fd-49db-a974-32d8e0eac658} - {898155d0-76ef-4702-a3ac-54ef6ac50726} + {dfb8aff5-cad3-485c-9038-e98a6075f897} - {61e2c669-1275-434f-8aad-37829260a70b} + {5ac52222-408c-47d7-af2f-ba6e86528d52} - {4a0aea66-ddd1-4d4e-8b5e-14359b38ac1d} + {88113371-e28c-41e6-8a58-530901f0237c} - {45a7079d-1b11-4ddc-8a85-779d650c70c9} + {cc9fe2fc-c263-4242-b689-c0fbd4868ce2} - {f8e95b18-cf2b-466c-bae9-475332aa5f22} + {072785e7-95b8-4476-9083-0b344fee7383} - {004f955a-e4aa-4d63-87f3-d86b036f4486} + {4f786d5b-5e84-4331-9cda-1a0c84e5a2ad} - {365a7e8c-51f6-4711-96ff-a76b0950f560} + {054c947a-5999-42bf-8e65-378b2bb60b97} diff --git a/NetSSL_Win/NetSSL_Win_vs170.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs170.vcxproj.filters index cdb8e5eecd..1ff0dfa09a 100644 --- a/NetSSL_Win/NetSSL_Win_vs170.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs170.vcxproj.filters @@ -2,40 +2,40 @@ - {529e4d63-2f77-4e5c-a2e5-34110a9c3dac} + {8a998ff6-6c22-4d3c-b39f-5c7bcc09178c} - {7aae5bb7-e02e-4b5a-a1d7-18defbb43ba6} + {34d33975-775a-4c13-8451-19253770f411} - {8b3810a5-f377-4c88-86ce-91955a65c818} + {5dab4ef6-a180-401d-b68d-a493d6c5519f} - {42aba42b-89c4-486d-bbcc-3362d6695961} + {1fb69e99-1e3a-49c1-8fca-35798bc29c5b} - {24caee21-d17b-44d7-a41c-cf4c70a2b38e} + {6fa1198b-3274-4afa-9233-4180ffa9582c} - {0e421c8b-7fab-4427-ae5a-4fc06d5a00f7} + {989e713c-afe3-47ef-aa35-bb679393d50e} - {4bf3cd72-825a-47ae-b749-34dc49f8bbf3} + {1683739c-ddaf-4658-a2ce-68c957770d5d} - {8add9720-7056-4d14-9003-e3419eb6338f} + {fe0f17eb-579e-487f-843d-0b8d27b64c8f} - {5e798d4b-82a7-48ca-b1d2-2c2c4240add3} + {0b55c232-02e6-4a66-ba8c-2e6f2bf3dbb1} - {e4074053-eb34-4fc6-83ff-9fa850c71c01} + {8938a3ec-7f33-4aec-ae63-cadb4df3be2f} - {24551290-9f10-4f62-8738-7d9f6b785866} + {64e2befe-afce-460f-8051-afab0a6bec59} - {cfda1168-eeb5-41ca-81f4-7a3217b74129} + {964d44a7-ee89-4ef7-a77f-60171636c9e3} diff --git a/PDF/PDF_vs160.vcxproj b/PDF/PDF_vs160.vcxproj index 7d126f5985..7609208de8 100644 --- a/PDF/PDF_vs160.vcxproj +++ b/PDF/PDF_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 PDF {E12E5C71-79A4-495A-848F-F1710111E610} PDF @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoPDFd PocoPDFmdd PocoPDFmtd @@ -239,7 +240,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoPDFd.dll @@ -271,7 +275,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoPDF.dll @@ -302,7 +309,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPDFmtd.lib @@ -327,7 +337,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPDFmt.lib @@ -350,7 +363,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPDFmdd.lib @@ -376,7 +392,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPDFmd.lib @@ -398,7 +417,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoPDF64d.dll @@ -430,7 +452,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoPDF64.dll @@ -461,7 +486,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPDFmtd.lib @@ -486,7 +514,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPDFmt.lib @@ -509,7 +540,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPDFmdd.lib @@ -534,7 +568,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPDFmd.lib @@ -543,303 +580,503 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/PDF/PDF_vs160.vcxproj.filters b/PDF/PDF_vs160.vcxproj.filters index 50d0965966..1ccf3fb275 100644 --- a/PDF/PDF_vs160.vcxproj.filters +++ b/PDF/PDF_vs160.vcxproj.filters @@ -2,40 +2,40 @@ - {e2c8ba69-4863-48f2-8a19-aeeaabe1f73f} + {2147d344-a273-4bec-a159-0533956dde98} - {2ae1d009-ec5d-4dbf-9519-f70505107e28} + {7bbb94a4-1fda-4900-b501-d4ed9a2533c5} - {99a0788e-8d76-4b22-b906-318faa14b222} + {f59ba8c9-f4a3-4fc1-ae94-91c32e70199f} - {f3fd66f0-d008-443f-9f84-2078f032e311} + {d7e3b737-c89a-4dfc-8fdb-900ab29633e2} - {832359ea-3125-432a-ac77-e326e8009a76} + {d93d1e92-430f-4f77-ac02-96ebaef9335c} - {108f07f7-e402-4fe2-a0ae-0b9f1342df06} + {71386b80-87ef-4c50-bd32-b3679c240b9d} - {98bd96eb-bbeb-4ad0-a595-c54c02748a71} + {79bdf3d1-4ff2-4f60-9ce8-b15eaf7ee48f} - {795f2adf-7af4-4748-b904-b5feca769dbe} + {46f3823b-7efa-4c76-a8c5-956a21022fa9} - {960f2e61-e7c3-45b4-bf6f-c5c2d6737ab4} + {628858eb-1e62-414d-925f-a7e699179c31} - {dd2d135f-e2ba-4605-94e1-384f84bddc00} + {52347645-b512-4309-9366-78215b12fe50} - {ed314e88-1f61-4e78-8485-4f02c2b70146} + {71f70366-43fe-442d-867e-59d2ca1bc3f8} - {744c66d2-2b02-4e00-8e4b-6297ad25a3f9} + {7293dc84-2119-4e8a-8adf-9304c9ab65a3} diff --git a/PDF/PDF_vs170.vcxproj.filters b/PDF/PDF_vs170.vcxproj.filters index e7c185fb00..2a9c9233ba 100644 --- a/PDF/PDF_vs170.vcxproj.filters +++ b/PDF/PDF_vs170.vcxproj.filters @@ -2,40 +2,40 @@ - {f426c4fb-4635-4391-8169-1e078aaa22b3} + {8b0ee6f7-72d5-44ea-80af-b431596d2806} - {d7818ff4-830b-4e66-9746-26126f718530} + {584e97fb-0883-44ff-ac92-0672a0485bb5} - {073dbf44-33de-4f4b-a13c-9e363cbfc4a5} + {041e037e-22da-4ea3-abf2-8a88bda70ed6} - {f2fe92b5-fe93-43c9-a865-6bb64838f66e} + {21479540-b703-4e9f-8a6d-3e34692dd351} - {ec84f2dd-f70c-41d3-a23d-306a26e13a9f} + {8a2c9fc5-7c5c-410f-a29a-ebafcc2e33e1} - {97e85bcc-b3d6-4d34-9b6c-c178d49915fc} + {0721ec2f-61e0-46f1-bf17-53306309840a} - {39714c8b-23da-48ba-aff0-f102ed25a1b6} + {099081cd-0596-467c-a1cb-ded50e74698a} - {6e56df48-04b3-410f-bc28-af19f16e993c} + {d8554d0b-1f5a-4366-8248-e7b86032ce64} - {722c70fe-5922-42fd-af5e-a44ab5445860} + {58ea1706-127b-4a81-94a9-0b550e833bae} - {4e5d60ed-707a-4a2b-b487-dd48987f50c4} + {302b069a-c690-41c3-a0ab-e4c2dbaf8053} - {b0774c0b-991f-44d6-a8d5-810757dba8f2} + {114ed72e-b981-4900-a7a0-c3d22b6aaaf2} - {32f3a026-d9c2-4bbe-af3c-c5e8345dd57d} + {fe75b6b6-c069-4e06-af69-2f7d6e9bec21} diff --git a/PageCompiler/File2Page/File2Page_vs160.vcxproj b/PageCompiler/File2Page/File2Page_vs160.vcxproj index bbb5845741..754ffc316c 100644 --- a/PageCompiler/File2Page/File2Page_vs160.vcxproj +++ b/PageCompiler/File2Page/File2Page_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 File2Page {8BD05B6C-A179-40F1-BD17-6EA813055883} File2Page @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 f2cpspd f2cpspd f2cpspd @@ -247,7 +248,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -279,7 +283,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +315,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -340,7 +350,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +382,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -401,7 +417,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +449,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -462,7 +484,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +516,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -523,7 +551,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +583,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -584,7 +618,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +637,8 @@ true + stdcpp17 + stdc11 diff --git a/PageCompiler/File2Page/File2Page_vs160.vcxproj.filters b/PageCompiler/File2Page/File2Page_vs160.vcxproj.filters index 0be3ef59a3..7a5799a0e4 100644 --- a/PageCompiler/File2Page/File2Page_vs160.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {22b8ca10-cbc0-497d-9176-e489aef58b8e} + {f168d4ca-1dba-44c3-9812-e35699e2ac79} - {59092698-1958-4bd6-9d1f-d58738b7504c} + {e653b149-9805-4b33-96c6-113afad23d91} diff --git a/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters b/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters index 4460a4d58a..3bf35e99a7 100644 --- a/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {5b6cb120-2052-4168-b459-5ad2e6304ec7} + {4d670046-8040-4f17-9e30-03c088a1f050} - {d1a7496e-488a-46aa-bdea-f7e55762edf9} + {e6d9313e-e10d-4518-96c4-2f94f8c82d53} diff --git a/PageCompiler/PageCompiler_vs160.vcxproj b/PageCompiler/PageCompiler_vs160.vcxproj index 6bb3fc8d31..969fe74df3 100644 --- a/PageCompiler/PageCompiler_vs160.vcxproj +++ b/PageCompiler/PageCompiler_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 PageCompiler {E12E5C71-79A4-495A-848F-F1710111E610} PageCompiler @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 cpspcd cpspcd cpspcd @@ -247,7 +248,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -279,7 +283,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +315,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -340,7 +350,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +382,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -401,7 +417,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +449,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -462,7 +484,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +516,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -523,7 +551,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +583,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -584,7 +618,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -603,21 +640,33 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/PageCompiler/PageCompiler_vs160.vcxproj.filters b/PageCompiler/PageCompiler_vs160.vcxproj.filters index 96d5abe0a4..387ebe664b 100644 --- a/PageCompiler/PageCompiler_vs160.vcxproj.filters +++ b/PageCompiler/PageCompiler_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {c0107822-7eca-40f6-a013-62cc72581a6a} + {167d3bcb-c3da-4f93-9998-3e377bce6340} - {6977db9b-fb08-4fae-8783-722e7c6ab1f6} + {8fa00271-a742-47e5-b050-695a2c4f7036} - {2f85e702-81d2-4f6d-90ac-a4801dab2b21} + {eadf2f27-aab0-4d04-9eac-30b8e0d31e68} diff --git a/PageCompiler/PageCompiler_vs170.vcxproj.filters b/PageCompiler/PageCompiler_vs170.vcxproj.filters index ad87e7d878..d33b18cddd 100644 --- a/PageCompiler/PageCompiler_vs170.vcxproj.filters +++ b/PageCompiler/PageCompiler_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {3373ba58-8c45-4d06-a20a-946c741b4542} + {103c577e-1024-4356-877a-36eb70613768} - {b7244796-750d-4fd9-97a1-989fceb9da18} + {d1492508-83e0-482f-9a79-49539e1a7fe8} - {f644b45f-70db-48a7-86e3-cf91d71dc74d} + {78a8528f-97de-4d4e-a65a-1e1f72c3893a} diff --git a/PocoDoc/PocoDoc_vs160.vcxproj b/PocoDoc/PocoDoc_vs160.vcxproj index c559a18166..1be817c058 100644 --- a/PocoDoc/PocoDoc_vs160.vcxproj +++ b/PocoDoc/PocoDoc_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 PocoDoc {18BCF3CC-9474-4D1C-9445-F783A49D886B} PocoDoc @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoDocd PocoDocd PocoDocd @@ -247,7 +248,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -279,7 +283,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +315,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -340,7 +350,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +382,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -401,7 +417,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +449,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -462,7 +484,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +516,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -523,7 +551,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +583,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -584,7 +618,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,9 +637,13 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/PocoDoc/PocoDoc_vs160.vcxproj.filters b/PocoDoc/PocoDoc_vs160.vcxproj.filters index 69039c5f7a..7203481821 100644 --- a/PocoDoc/PocoDoc_vs160.vcxproj.filters +++ b/PocoDoc/PocoDoc_vs160.vcxproj.filters @@ -2,22 +2,22 @@ - {01b5e332-6094-415c-acd2-590898991b45} + {4dfb2677-ba00-4697-bb9d-1f1c9da62e9f} - {0a0a99ea-e9fc-49e8-a288-c93ed5b1c3fb} + {d4bc48cf-7c38-4274-ad03-0bd815230453} - {e4c40212-d02d-4daa-a363-77e603be3a27} + {8dd6fbfa-e929-4dd1-a48c-527992622805} - {9be358e6-e617-489b-92f6-637843ac9d59} + {7b2eec2f-7b1f-4028-9cd5-6d91816235cf} - {03e8b590-102d-4b91-bd0a-3bb62b77d04f} + {f7c73656-f588-48b7-999e-748ba112fc04} - {ff475b96-688b-49be-b8cf-5b65d5d92f71} + {0908252d-c28d-4e2e-ad58-7723ccad1ed2} diff --git a/PocoDoc/PocoDoc_vs170.vcxproj.filters b/PocoDoc/PocoDoc_vs170.vcxproj.filters index 27d09a9830..266a11fabe 100644 --- a/PocoDoc/PocoDoc_vs170.vcxproj.filters +++ b/PocoDoc/PocoDoc_vs170.vcxproj.filters @@ -2,22 +2,22 @@ - {2285d602-2fd1-4276-887c-7dc9d8c4751f} + {4bc1a488-a8d2-485d-b2d9-4a5fd70cf548} - {4909c872-7e96-4974-bc68-b9ff7d28c454} + {200221dd-1061-4fb9-a144-d24b2455f9c9} - {2b98b6ea-162a-4f7c-8fc6-df11e9857293} + {1da7b280-7485-46f3-aaf7-2414f4b7b8d0} - {0699b1a7-de87-46a2-aad5-d0fa2b2ace3f} + {897337fb-f9a0-4575-90a8-842df1d65186} - {1f5e1fc4-3b23-4eed-a143-065894c933aa} + {8a417062-b6db-4c71-95e4-d8151b42ac9e} - {c9b50355-c6f5-4906-a49f-6e8ab416d3dc} + {f753423c-d64a-4dba-920d-7ec1d9ccfb4b} diff --git a/PocoDoc/cfg/mkdoc-poco.xml b/PocoDoc/cfg/mkdoc-poco.xml index 841c4aae39..0c22fdca02 100644 --- a/PocoDoc/cfg/mkdoc-poco.xml +++ b/PocoDoc/cfg/mkdoc-poco.xml @@ -7,7 +7,6 @@ ${PocoBuild}/*/include/Poco/*/*/*.h ${PocoBuild}/*/include/Poco/*/*.h ${PocoBuild}/*/*/include/Poco/*/*/*.h - ${PocoBuild}/Data/src/sql-parser/*.h *_*.h, diff --git a/ProGen/ProGen_vs160.vcxproj b/ProGen/ProGen_vs160.vcxproj index 860850d652..a2c10361c0 100644 --- a/ProGen/ProGen_vs160.vcxproj +++ b/ProGen/ProGen_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 ProGen {48D690D9-6520-4F30-A298-3132548716D0} ProGen @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 progend progend progend @@ -247,7 +248,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -279,7 +283,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +315,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -340,7 +350,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +382,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -401,7 +417,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +449,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -462,7 +484,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +516,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -523,7 +551,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +583,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -584,7 +618,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -603,9 +640,13 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/ProGen/ProGen_vs160.vcxproj.filters b/ProGen/ProGen_vs160.vcxproj.filters index d7fedb5bf2..1464664b12 100644 --- a/ProGen/ProGen_vs160.vcxproj.filters +++ b/ProGen/ProGen_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {c3e335a9-d2d8-4e8d-b0ff-bc9f31fa23dc} + {b2b1626e-a4dc-422c-9d34-8106dc77de45} - {b1b5faf1-7bdf-4a7d-b2f5-885b8ab95bc2} + {7eeb2e56-ed12-4e76-8700-dda28d87b3d6} - {ea128d09-a049-4ff5-afdf-07159f7556a5} + {70071a2f-404a-460b-ad62-a548a237d312} diff --git a/ProGen/ProGen_vs170.vcxproj.filters b/ProGen/ProGen_vs170.vcxproj.filters index b1b9720c06..cd0431579a 100644 --- a/ProGen/ProGen_vs170.vcxproj.filters +++ b/ProGen/ProGen_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {a1546477-6c69-498d-ba86-3a38eeafcafa} + {b4c3627d-4f8f-4220-afe9-a97bdef310bc} - {9d13273d-cec3-418d-899e-198ded914263} + {265452f8-f250-4108-8f40-f075d121082f} - {e6a0ecf9-6f30-482d-b44d-41bf35797a3f} + {f276f34d-49d8-4807-823c-6c6020b75a57} diff --git a/ProGen/src/ProGen.cpp b/ProGen/src/ProGen.cpp index 6909abe2ae..8ddf3e3dbc 100644 --- a/ProGen/src/ProGen.cpp +++ b/ProGen/src/ProGen.cpp @@ -580,15 +580,36 @@ class ProGenApp: public Application void fix2019Project(Poco::AutoPtr pProjectDoc, const std::set& configSet, const std::string& platform, const Poco::Util::AbstractConfiguration& projectProps, const Poco::Util::AbstractConfiguration& templateProps) { fix20XXProject(pProjectDoc, configSet, platform, projectProps, templateProps, "v142"); + Poco::AutoPtr pLinkList = pProjectDoc->getElementsByTagName("Link"); + for (unsigned long i = 0; i < pLinkList->length(); i++) + { + Poco::XML::Element* pLinkElem = static_cast(pLinkList->item(i)); + Poco::XML::Element* pItemDefinitionGroupElem = static_cast(pLinkElem->parentNode()); + Poco::XML::XMLString condition = pItemDefinitionGroupElem->getAttribute("Condition"); + if (Poco::endsWith(condition, Poco::XML::XMLString("ARM64'"))) + { + appendElement(pLinkElem, "TargetMachine", "MachineARM64"); + } + } + Poco::AutoPtr pClCompileList = pProjectDoc->getElementsByTagName("ClCompile"); + for (unsigned long i = 0; i < pClCompileList->length(); i++) + { + Poco::XML::Element* pClCompileElem = static_cast(pClCompileList->item(i)); + Poco::AutoPtr pLanguageStandard = pProjectDoc->createElement("LanguageStandard"); + Poco::AutoPtr pStandardText = pProjectDoc->createTextNode("stdcpp17"); + pLanguageStandard->appendChild(pStandardText); + pClCompileElem->appendChild(pLanguageStandard); + + pClCompileElem = static_cast(pClCompileList->item(i)); + pLanguageStandard = pProjectDoc->createElement("LanguageStandard_C"); + pStandardText = pProjectDoc->createTextNode("stdc11"); + pLanguageStandard->appendChild(pStandardText); + pClCompileElem->appendChild(pLanguageStandard); + } } void fix2022Project(Poco::AutoPtr pProjectDoc, const std::set& configSet, const std::string& platform, const Poco::Util::AbstractConfiguration& projectProps, const Poco::Util::AbstractConfiguration& templateProps) { - // TODO: handle standards - // in template: - // LanguageStandard="${vc.project.compiler.std.cpp}" - // LanguageStandard_C="${vc.project.compiler.std.c}" - // for now, we're getting by through AdditionalOptions for C++ fix20XXProject(pProjectDoc, configSet, platform, projectProps, templateProps, "v143"); Poco::AutoPtr pLinkList = pProjectDoc->getElementsByTagName("Link"); for (unsigned long i = 0; i < pLinkList->length(); i++) diff --git a/Prometheus/Prometheus_vs160.vcxproj b/Prometheus/Prometheus_vs160.vcxproj index 3cd101c958..c6e94ed637 100644 --- a/Prometheus/Prometheus_vs160.vcxproj +++ b/Prometheus/Prometheus_vs160.vcxproj @@ -242,6 +242,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoPrometheusd.dll @@ -275,6 +277,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoPrometheus.dll @@ -307,6 +311,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPrometheusmtd.lib @@ -333,6 +339,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPrometheusmt.lib @@ -357,6 +365,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPrometheusmdd.lib @@ -384,6 +394,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPrometheusmd.lib @@ -407,6 +419,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoPrometheus64d.dll @@ -440,6 +454,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoPrometheus64.dll @@ -472,6 +488,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPrometheusmtd.lib @@ -498,6 +516,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPrometheusmt.lib @@ -522,6 +542,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPrometheusmdd.lib @@ -548,6 +570,8 @@ Default /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPrometheusmd.lib @@ -577,42 +601,68 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Prometheus/Prometheus_vs160.vcxproj.filters b/Prometheus/Prometheus_vs160.vcxproj.filters index 1aaf386a3e..18c4207f8f 100644 --- a/Prometheus/Prometheus_vs160.vcxproj.filters +++ b/Prometheus/Prometheus_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {a2e895c5-43ef-44fc-8843-8ce5f32490a3} + {53e83ccc-827e-4896-bbeb-c4af93f56f6a} - {007e1e30-599f-40f1-a03b-73d4ccc2697f} + {f39563e8-4f70-48b9-b6e7-8ef510013de5} - {4b99f8e7-b3ca-42ce-8513-51b68ad0f46a} + {37abdb5e-2411-4f75-8542-aecd474db03e} diff --git a/Prometheus/Prometheus_vs170.vcxproj.filters b/Prometheus/Prometheus_vs170.vcxproj.filters index 5bcf530729..610535c6e8 100644 --- a/Prometheus/Prometheus_vs170.vcxproj.filters +++ b/Prometheus/Prometheus_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {5f0e8c47-e90e-48f5-b3f0-363d1969fcba} + {d305b0c7-712f-42b3-8ec3-327ca5750233} - {316b98f5-3da2-4a16-b927-31a14c7cf767} + {d57dd874-479d-4fbe-bda8-92e240800515} - {6f6d0101-51af-4819-b50a-f55927be1957} + {bed725cd-dd21-4ed5-950f-4bf9e21d8af6} diff --git a/Redis/Redis_vs160.vcxproj b/Redis/Redis_vs160.vcxproj index 305101af7a..3daebe2d21 100644 --- a/Redis/Redis_vs160.vcxproj +++ b/Redis/Redis_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 Redis {12E39EE2-7049-312D-B390-7568D727CA25} Redis @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoRedisd PocoRedismdd PocoRedismtd @@ -239,7 +240,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoRedisd.dll @@ -271,7 +275,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoRedis.dll @@ -302,7 +309,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoRedismtd.lib @@ -327,7 +337,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoRedismt.lib @@ -350,7 +363,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoRedismdd.lib @@ -376,7 +392,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoRedismd.lib @@ -398,7 +417,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoRedis64d.dll @@ -430,7 +452,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoRedis64.dll @@ -461,7 +486,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoRedismtd.lib @@ -486,7 +514,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoRedismt.lib @@ -509,7 +540,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoRedismdd.lib @@ -534,7 +568,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoRedismd.lib @@ -543,30 +580,48 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Redis/Redis_vs160.vcxproj.filters b/Redis/Redis_vs160.vcxproj.filters index c7aeffb33b..aedae3e09c 100644 --- a/Redis/Redis_vs160.vcxproj.filters +++ b/Redis/Redis_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {c838acd1-df13-44f5-899c-c048ac989bbd} + {7f4a1497-cef9-4ebe-a134-1dd9e43e76ca} - {75ebd299-687a-4804-b0bd-c2b38d539af3} + {24533806-0e15-49b2-9cdf-ea0148d2c4e0} diff --git a/Redis/Redis_vs170.vcxproj.filters b/Redis/Redis_vs170.vcxproj.filters index d433d236ca..b6b354b651 100644 --- a/Redis/Redis_vs170.vcxproj.filters +++ b/Redis/Redis_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {ed08d752-2ac4-4a37-9ae8-c7eb7953b09c} + {07150746-2836-426e-a3b4-cde4cabf3d83} - {48880c00-e839-48c7-8e0b-f986530ce20c} + {d7af6162-3f3c-4ffa-9d99-65691d86f4fa} diff --git a/Util/Util_vs160.vcxproj b/Util/Util_vs160.vcxproj index 8df3c5599b..00482cb4c2 100644 --- a/Util/Util_vs160.vcxproj +++ b/Util/Util_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 Util {6FF56CDB-787A-4714-A28C-919003F9FA6C} Util @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoUtild PocoUtilmdd PocoUtilmtd @@ -239,7 +240,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoUtild.dll @@ -271,7 +275,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoUtil.dll @@ -302,7 +309,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoUtilmtd.lib @@ -327,7 +337,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoUtilmt.lib @@ -350,7 +363,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoUtilmdd.lib @@ -376,7 +392,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoUtilmd.lib @@ -398,7 +417,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoUtil64d.dll @@ -430,7 +452,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoUtil64.dll @@ -461,7 +486,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoUtilmtd.lib @@ -486,7 +514,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoUtilmt.lib @@ -509,7 +540,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoUtilmdd.lib @@ -534,7 +568,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoUtilmd.lib @@ -578,96 +615,158 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Util/Util_vs160.vcxproj.filters b/Util/Util_vs160.vcxproj.filters index 30e6375536..1d553f4499 100644 --- a/Util/Util_vs160.vcxproj.filters +++ b/Util/Util_vs160.vcxproj.filters @@ -2,58 +2,58 @@ - {73be1d46-40be-4ebd-89be-73b4915f9588} + {cf9ff27f-c608-4221-acd5-9ec8f6d06b47} - {23e7b4b4-32f6-45bb-aeaf-aacbe2d7a19a} + {cd925d5a-2a4a-4eb0-abc0-1bd7e0ed765b} - {c190a5a2-2e88-4810-a309-e0574878f233} + {d257b037-83f7-47cd-bd76-52b28e204d3b} - {48997186-98e1-4804-93db-f3f8dd59257b} + {0096a0e0-fb96-43a9-94d9-61c3f27f6625} - {7d8521f9-fe59-46f9-b56e-1e5e2a2deb82} + {ddc4db4d-2f52-414e-99df-6db934c4c5a5} - {833e08f9-7f52-4f8a-86fe-6a67255476f1} + {4322c805-411f-4104-b9b4-5021762902c0} - {4458d4b8-0eb6-46ae-a92a-d86628dc2d63} + {3ba7445e-abc9-43dc-bed5-127db1a57c27} - {c5285fd4-76c7-40bb-9242-5c0211ad4d57} + {5e8e6197-e0d6-49c6-a9b7-0b592ed6daba} - {e9ad10ed-b7f8-4536-96f3-09f5db57ea3d} + {e22e3615-cc6e-41fc-81cf-e87af424ad3c} - {1a6b7d18-60e6-4766-8674-278a02d552c8} + {3921c885-89a3-4c9c-92c1-113d817266f3} - {afccb3c3-5bf0-4d98-af22-bc4aad0d979b} + {156dc5e3-c9a1-4c00-b513-3cb5bed8029b} - {5bc9b5b6-ed82-48ee-85ec-3959108a78d7} + {958fb7eb-d810-42dd-bfe9-dd8d076d78f0} - {c5e0e0d0-68ca-48e2-9f52-abd41d287359} + {23284305-4dff-4522-8279-df7cf02afd93} - {9a78cc94-c8fb-4c68-87f9-7860f90702bd} + {65499a05-965b-4707-a3b9-6a4dca022258} - {d508f3ba-b9dd-4fc3-95d8-410976dc8bfb} + {cc40a606-35a0-443a-b148-1fec1663b42b} - {4becd24d-4c2b-4ad7-a800-3cae02af7504} + {5357cbb6-94d0-4a6a-8276-23c156504c7a} - {5f654520-9b40-4f75-8e19-2ec25800d900} + {9db539ab-6e8e-4248-acb7-3aa71f648bb2} - {8622d8f8-7fd0-4094-8b44-318652fa1ddd} + {16c9957b-edc6-4791-b7fc-4defc5f92143} diff --git a/Util/Util_vs170.vcxproj.filters b/Util/Util_vs170.vcxproj.filters index 9a07fa7f39..95006b56ca 100644 --- a/Util/Util_vs170.vcxproj.filters +++ b/Util/Util_vs170.vcxproj.filters @@ -2,58 +2,58 @@ - {6a1a5ec7-003a-40c5-b947-0b0873e2d6ee} + {31dea0da-1610-476c-9b7d-3472427b4641} - {05e1ed3e-9afb-4ebf-b835-fe9bfbe194af} + {1060f661-3e5a-4ae6-af77-5c998f2a04ca} - {e60dae01-1e6c-4a67-9fa1-0c3c3bdf2826} + {d3d7ed03-475c-4029-a086-9dc659f6676d} - {694c6834-669b-4356-8727-47d3298c00e5} + {b621ef20-0803-4f8d-85e6-78fe62c6f2da} - {e7f9d0c1-ae68-4c6e-8814-81724a1662ca} + {f240bd4e-9bc6-4160-8413-b20219dba320} - {597875d6-a827-49d3-b0e1-2313de020ef8} + {b6592213-0f27-4f53-b6a4-45f8b7d294cb} - {e27da853-1946-44e4-b200-f53a773e1134} + {ae25771c-adbc-4915-9929-49aed8c75203} - {ee93df46-e21d-433c-b500-2c4a130af4f6} + {76b34b02-bc40-459d-a93f-4d9e4f6a1cd0} - {d27baf62-7fd5-4f21-a096-a79b10887b53} + {882878f4-c179-4e84-9027-909a2ae1ffd2} - {4fbc8357-ff74-4ae2-8ba4-88d677cd35a6} + {a49cd00b-d063-4906-974a-a1323df809de} - {1e296277-0844-4bcb-8913-84097f9ea347} + {38fd5a99-3c0d-46b1-809a-82b419ead9d4} - {fdcd64c6-3670-475c-b6ef-24dc1b5254ef} + {187e3570-fcfa-4503-b6c3-a71d7d02c5a3} - {e02e5e88-f17a-4adf-9ad0-6e951bccb754} + {090c93e6-0af2-4c44-afce-afffc03c105a} - {22c8acd6-e2b4-4135-834f-6559c40b8456} + {a4f42f66-6386-49d2-b550-7cec7a63bf97} - {6dd6b69f-a286-4491-9e64-e4bfd76501ed} + {7307faa2-93c9-489b-9705-08ed7384550c} - {08210efd-f79f-4982-b94c-38405588e32c} + {aa55825e-edb4-47fd-9569-28a741f031b1} - {942eb908-d116-4aad-9854-162dbd92116f} + {f63f6046-0783-4d9b-883f-47f596f96872} - {dcd9985c-7c22-4900-917d-a3826ca33b75} + {0acefac5-7909-4be8-9a8b-e569d49e3084} diff --git a/XML/XML_vs160.vcxproj b/XML/XML_vs160.vcxproj index ce0edaec5d..7b2902d49b 100644 --- a/XML/XML_vs160.vcxproj +++ b/XML/XML_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 XML {9E211743-85FE-4977-82F3-4F04B40C912D} XML @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoXMLd PocoXMLmdd PocoXMLmtd @@ -239,7 +240,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoXMLd.dll @@ -271,7 +275,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoXML.dll @@ -302,7 +309,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoXMLmtd.lib @@ -327,7 +337,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoXMLmt.lib @@ -350,7 +363,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoXMLmdd.lib @@ -376,7 +392,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoXMLmd.lib @@ -398,7 +417,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoXML64d.dll @@ -430,7 +452,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoXML64.dll @@ -461,7 +486,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoXMLmtd.lib @@ -486,7 +514,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoXMLmt.lib @@ -509,7 +540,10 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoXMLmdd.lib @@ -534,7 +568,10 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoXMLmd.lib @@ -633,216 +670,358 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true @@ -858,9 +1037,13 @@ true true true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true @@ -876,6 +1059,8 @@ true true true + stdcpp17 + stdc11 true @@ -891,9 +1076,13 @@ true true true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/XML/XML_vs160.vcxproj.filters b/XML/XML_vs160.vcxproj.filters index d7bcfcdff4..d73b5ebe90 100644 --- a/XML/XML_vs160.vcxproj.filters +++ b/XML/XML_vs160.vcxproj.filters @@ -2,40 +2,40 @@ - {433d0fe7-25ac-4eae-9fce-d4c585cc4fc0} + {6a8bdbbe-442a-457d-ab07-46014587f83b} - {774efa02-3244-44e4-a4e8-84ac6123fd43} + {3c2890c2-f54d-4866-97a4-c28b560be0a2} - {1e6c8027-8fc3-43a3-9d01-261dcfda999c} + {3043f1fb-3883-4bff-8ce5-f51310aee8c7} - {50f3c0fb-8844-41e2-9a22-a55a88bf1f26} + {3e76e647-6cf5-4ca8-b565-6cb6a444629f} - {3e7fc746-30fa-4328-96b2-f97dcf4370e0} + {10630328-fa99-4dcc-82c7-ffca37620761} - {e22185b7-0aa5-43dc-9a2b-ceb41f74d051} + {74569b02-679d-49f8-a9d3-ce79613a9368} - {334c227f-0fa4-4923-9b4a-b6f870ddbbdd} + {30946367-448b-4f50-a0d6-2ddbca08aabd} - {a0fe306c-3abf-4f39-a45a-dcbc624315ee} + {360baa69-a63b-4ae9-a908-3b728fa2b4dc} - {e8a1745d-3932-4f15-b214-04aaced8f534} + {0158f4c2-36f6-4542-9116-e9b69b4af966} - {73e4e2f8-e169-4435-9838-6ba4e5a31d56} + {d2f6b655-b0d0-45a4-aa35-4819871302c4} - {6e251cd3-3e87-4df5-b091-841119173edf} + {de3b38e4-3064-407d-8787-7e594f0f03a8} - {f73f68ef-4e04-46af-b2c3-7593d0b8b315} + {3184fa9b-36fc-4352-ad47-7c7d99409a7b} diff --git a/XML/XML_vs170.vcxproj.filters b/XML/XML_vs170.vcxproj.filters index 81978313e1..6127e56afd 100644 --- a/XML/XML_vs170.vcxproj.filters +++ b/XML/XML_vs170.vcxproj.filters @@ -2,40 +2,40 @@ - {01b91afa-ebf6-4ac8-9b98-0d68c6421a50} + {96b51512-3a64-46af-ab78-a51faa1cd6df} - {b21671d7-0a08-4d01-9af9-01a120046a89} + {b9ec7b17-e73d-426e-a76d-eebc7666da78} - {dfb379de-c6dc-462b-bea7-b3cb8afc0e67} + {9231605d-1428-4e8e-9b05-576974d29681} - {67f6a500-649c-498b-8367-2c8ebea0eb99} + {4a70c9bd-4202-4927-9611-5aec7641a968} - {fa07dc3c-aa0b-4a1c-94a4-bbb95c13081c} + {cac5dc2f-6bea-4219-9ad0-5746260dd79d} - {c42c455b-1085-4ecd-b251-d7f635d685b7} + {aa92d9ae-49a3-40c8-b6b7-e68295c52ff7} - {815e94e8-d409-4af9-b5c3-76ad5bc4c888} + {b26d1bf0-b484-46d1-886b-06d025bc83fe} - {f9c0dece-6a1a-4bbb-9770-72d2b41ba798} + {796b42b1-952a-4783-8c3a-a0559e181c3a} - {13676f85-7b77-4e42-b347-781fba0cd0b1} + {fc023bda-543a-4828-81a1-d9c1a694badc} - {7e1f7f43-19ab-4eea-8d8f-c7b220a29012} + {3e03ea7d-3bab-4a12-bfe4-91d9ef4b5901} - {1a0c5add-b2e4-4db9-9cbe-a914bf252995} + {7cd33215-14dd-4c36-bb74-0bf0092392e5} - {740021f0-b269-4cd7-9f74-81a03e30bd11} + {d3571ff7-2366-434e-bc0f-20bf9079fc7b} diff --git a/Zip/Zip_vs160.vcxproj b/Zip/Zip_vs160.vcxproj index 8fe7bb28c0..d9b2be0bf0 100644 --- a/Zip/Zip_vs160.vcxproj +++ b/Zip/Zip_vs160.vcxproj @@ -1,667 +1,16 @@ - - - - debug_shared - Win32 - - - debug_shared - x64 - - - debug_static_md - Win32 - - - debug_static_md - x64 - - - debug_static_mt - Win32 - - - debug_static_mt - x64 - - - release_shared - Win32 - - - release_shared - x64 - - - release_static_md - Win32 - - - release_static_md - x64 - - - release_static_mt - Win32 - - - release_static_mt - x64 - - + + - Zip - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} - Zip - Win32Proj + 17.0 - - StaticLibrary - MultiByte - v142 - - - StaticLibrary - MultiByte - v142 - - - StaticLibrary - MultiByte - v142 - - - StaticLibrary - MultiByte - v142 - - - DynamicLibrary - MultiByte - v142 - - - DynamicLibrary - MultiByte - v142 - - - StaticLibrary - MultiByte - v142 - - - StaticLibrary - MultiByte - v142 - - - StaticLibrary - MultiByte - v142 - - - StaticLibrary - MultiByte - v142 - - - DynamicLibrary - MultiByte - v142 - - - DynamicLibrary - MultiByte - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.28307.799 - PocoZipd - PocoZipmdd - PocoZipmtd - PocoZip - PocoZipmd - PocoZipmt - PocoZip64d - PocoZipmdd - PocoZipmtd - PocoZip64 - PocoZipmd - PocoZipmt - - - ..\bin\ - obj\Zip\$(Configuration)\ - true - - - ..\bin\ - obj\Zip\$(Configuration)\ - false - - - ..\lib\ - obj\Zip\$(Configuration)\ - - - ..\lib\ - obj\Zip\$(Configuration)\ - - - ..\lib\ - obj\Zip\$(Configuration)\ - - - ..\lib\ - obj\Zip\$(Configuration)\ - - - ..\bin64\ - obj64\Zip\$(Configuration)\ - true - - - ..\bin64\ - obj64\Zip\$(Configuration)\ - false - - - ..\lib64\ - obj64\Zip\$(Configuration)\ - - - ..\lib64\ - obj64\Zip\$(Configuration)\ - - - ..\lib64\ - obj64\Zip\$(Configuration)\ - - - ..\lib64\ - obj64\Zip\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoZipd.dll - true - true - ..\bin\PocoZipd.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoZipd.lib - MachineX86 - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\PocoZip.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoZip.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoZipmtd.pdb - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ..\lib\PocoZipmtd.lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ..\lib\PocoZipmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoZipmdd.pdb - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ..\lib\PocoZipmdd.lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoZipmd.pdb - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoZipmd.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin64\PocoZip64d.dll - true - true - ..\bin64\PocoZip64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) - Console - ..\lib64\PocoZipd.lib - MachineX64 - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Zip_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin64\PocoZip64.dll - true - false - ..\lib64;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib64\PocoZip.lib - MachineX64 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib64\PocoZipmtd.pdb - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ..\lib64\PocoZipmtd.lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ..\lib64\PocoZipmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib64\PocoZipmdd.pdb - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ..\lib64\PocoZipmdd.lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - 4244;4267;%(DisableSpecificWarnings) - true - - - ..\lib64\PocoZipmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - true - true - true - true - true - true - true - true - - + + + diff --git a/Zip/Zip_vs160.vcxproj.filters b/Zip/Zip_vs160.vcxproj.filters index 1a907db9a7..0b07de1b27 100644 --- a/Zip/Zip_vs160.vcxproj.filters +++ b/Zip/Zip_vs160.vcxproj.filters @@ -1,165 +1,3 @@  - - - - {b0ee098a-884b-4980-bbe8-be7f2ef7ae2d} - - - {1faaed9a-b145-4633-bb8c-bbb900292d14} - - - {b9795618-b76e-4c7a-94ff-ef204823bed4} - - - {62757a14-b297-42db-a8ce-cf620c0e9994} - - - {c7a04108-1936-4204-9137-492df31cc453} - - - {8cda9793-979c-4b2d-b665-7b9b41a777c7} - - - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Zip\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - Manipulation\Header Files - - - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Zip\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - Manipulation\Source Files - - - - - + \ No newline at end of file diff --git a/Zip/Zip_vs170.vcxproj.filters b/Zip/Zip_vs170.vcxproj.filters index 5b761c9f0c..4dd0b077a2 100644 --- a/Zip/Zip_vs170.vcxproj.filters +++ b/Zip/Zip_vs170.vcxproj.filters @@ -2,22 +2,22 @@ - {b93d89ba-f62a-4cec-b531-d1ebbb43cf72} + {690a8469-95ed-462d-972f-79391d782dcc} - {dd3162fa-9348-4495-871f-9ce5a78be181} + {c3628cbf-b2f9-4ea7-8503-ba643b4e855f} - {b5c6e1af-a887-4a12-847b-aac19cad216f} + {59b6e61c-93ab-4dbd-aa27-56fbb3960e30} - {fee1c853-3a9a-4ad7-9eb8-4e0959442ebd} + {0a8e2b79-875a-42c4-8879-933845e48657} - {347bae64-89a9-4e25-8672-d0eb5ce7b967} + {2947c209-69d5-4657-ad85-67745de8389f} - {a83f3972-4019-4d5f-b8d8-3404d84478aa} + {891520ba-8a6a-4469-ab40-d2838d46a3f7} diff --git a/build/rules/compile b/build/rules/compile index 5f2b412611..9dbebaa5cb 100644 --- a/build/rules/compile +++ b/build/rules/compile @@ -109,7 +109,7 @@ ifndef POCO_DATA_NO_SQL_PARSER # SQL parser sources -SQLDIR = src/sql-parser/src +SQLDIR = SQLParser/src SQLPARSERDIR = $(SQLDIR)/parser SQLSQLDIR = $(SQLDIR)/sql SQLUTILDIR = $(SQLDIR)/util diff --git a/cmake/FindApache2.cmake b/cmake/FindApache2.cmake index adc31fb71e..52c8eb6a3c 100644 --- a/cmake/FindApache2.cmake +++ b/cmake/FindApache2.cmake @@ -26,6 +26,7 @@ find_path(APACHE2_INCLUDE_DIR httpd.h ${APACHE2_ROOT_INCLUDE_DIRS} PATHS ${PC_APACHE2_INCLUDE_DIRS} + /usr/include/httpd /usr/local/include/apache2 /usr/include/apache2 ) diff --git a/cmake/FindODBC.cmake b/cmake/FindODBC.cmake index d572d93bb7..3c59fd3807 100644 --- a/cmake/FindODBC.cmake +++ b/cmake/FindODBC.cmake @@ -36,6 +36,7 @@ find_path(ODBC_INCLUDE_DIR PATHS ${PC_ODBC_INCLUDE_DIRS} /usr/include + /usr/include/libiodbc /usr/local/include /usr/local/odbc/include /usr/local/iodbc/include diff --git a/configure b/configure index b9d020d568..1ceeebeeeb 100755 --- a/configure +++ b/configure @@ -79,9 +79,8 @@ $(ls -C "$base"/build/config/) Disables small object optimization. --no-sqlparser - Compile with POCO_DATA_NO_SQL_PARSER - SQLParser is not enabled by default for c++14 and below, - so this option only has meaning for c++17 and above. + Compile with -DPOCO_DATA_NO_SQL_PARSER + Disables compilation of the SQLParser. --sqlite-fts= Compile with -DPOCO_DATA_SQLITE_FTS. diff --git a/release/script/mkrelease b/release/script/mkrelease index 37a7026957..309061c730 100755 --- a/release/script/mkrelease +++ b/release/script/mkrelease @@ -395,24 +395,6 @@ distclean: ENDOFSCRIPT -# -# Create Visual Studio 14 build script -# -cat >${target}/build_vs140.cmd <<'ENDOFSCRIPT' -@echo off -buildwin 140 build shared both Win32 samples -ENDOFSCRIPT - - -# -# Create Visual Studio 15 build script -# -cat >${target}/build_vs150.cmd <<'ENDOFSCRIPT' -@echo off -buildwin 150 build shared both Win32 samples -ENDOFSCRIPT - - # # Create Visual Studio 16 build script # @@ -435,8 +417,6 @@ ENDOFSCRIPT # Fix line endings # if [ "$lineEndConv" != "" ] ; then - $lineEndConv ${target}/build_vs140.cmd - $lineEndConv ${target}/build_vs150.cmd $lineEndConv ${target}/build_vs160.cmd $lineEndConv ${target}/build_vs170.cmd $lineEndConv ${target}/Makefile