From ee39b611f203e954c8f33a5ea929f94259132f89 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Tue, 13 Feb 2024 14:04:23 +0100 Subject: [PATCH] fix(SQLParser): move to Data dir; add extradirs, remove vs 140,150 build scripts generation --- ActiveRecord/ActiveRecord.progen | 2 +- ActiveRecord/ActiveRecord_vs160.vcxproj | 24 +++---- ActiveRecord/ActiveRecord_vs170.vcxproj | 36 +++++----- ActiveRecord/CMakeLists.txt | 3 +- ActiveRecord/testsuite/TestSuite.progen | 2 +- .../testsuite/TestSuite_vs160.vcxproj | 24 +++---- .../testsuite/TestSuite_vs170.vcxproj | 36 +++++----- CppParser/testsuite/src/CppParserTest.cpp | 2 +- Data/CMakeLists.txt | 7 +- Data/Data_VS90.vcproj | 70 +++++++++---------- Data/Data_vs160.vcxproj | 70 +++++++++---------- Data/Data_vs160.vcxproj.filters | 70 +++++++++---------- Data/Data_vs170.vcxproj | 70 +++++++++---------- Data/Data_vs170.vcxproj.filters | 70 +++++++++---------- Data/Makefile | 2 +- Data/MySQL/CMakeLists.txt | 3 +- Data/MySQL/Makefile | 2 +- Data/MySQL/MySQL_VS90.vcproj | 12 ++-- Data/MySQL/MySQL_vs160.vcxproj | 24 +++---- Data/MySQL/MySQL_vs170.vcxproj | 36 +++++----- Data/MySQL/testsuite/Makefile | 2 +- Data/MySQL/testsuite/TestSuite_VS90.vcproj | 12 ++-- Data/MySQL/testsuite/TestSuite_vs160.vcxproj | 24 +++---- Data/MySQL/testsuite/TestSuite_vs170.vcxproj | 36 +++++----- Data/ODBC/CMakeLists.txt | 3 +- Data/ODBC/Makefile | 2 +- Data/ODBC/ODBC.progen | 2 +- Data/ODBC/ODBC_VS90.vcproj | 12 ++-- Data/ODBC/ODBC_vs160.vcxproj | 24 +++---- Data/ODBC/ODBC_vs170.vcxproj | 36 +++++----- Data/ODBC/testsuite/Makefile | 3 +- Data/ODBC/testsuite/TestSuite.progen | 2 +- Data/ODBC/testsuite/TestSuite_VS90.vcproj | 12 ++-- Data/ODBC/testsuite/TestSuite_vs160.vcxproj | 24 +++---- Data/ODBC/testsuite/TestSuite_vs170.vcxproj | 36 +++++----- Data/PostgreSQL/CMakeLists.txt | 4 +- Data/PostgreSQL/Makefile | 2 +- Data/PostgreSQL/PostgreSQL_VS90.vcproj | 12 ++-- Data/PostgreSQL/PostgreSQL_vs160.vcxproj | 24 +++---- Data/PostgreSQL/PostgreSQL_vs170.vcxproj | 36 +++++----- Data/PostgreSQL/testsuite/Makefile | 2 +- .../testsuite/TestSuite_VS90.vcproj | 12 ++-- .../testsuite/TestSuite_vs160.vcxproj | 24 +++---- .../testsuite/TestSuite_vs170.vcxproj | 36 +++++----- Data/{src/sql-parser => SQLParser}/LICENSE | 0 Data/{src/sql-parser => SQLParser}/Makefile | 0 Data/{src/sql-parser => SQLParser}/README.md | 0 .../benchmark/README.md | 0 .../benchmark/benchmark.cpp | 0 .../benchmark/benchmark_utils.cpp | 0 .../benchmark/benchmark_utils.h | 0 .../benchmark/parser_benchmark.cpp | 0 .../benchmark/queries.cpp | 0 .../benchmark/queries.h | 0 .../src/SQLParser.cpp | 0 .../sql-parser => SQLParser}/src/SQLParser.h | 0 .../src/SQLParserResult.cpp | 0 .../src/SQLParserResult.h | 0 .../src/parser/.gitignore | 0 .../src/parser/Makefile | 0 .../src/parser/bison_parser.cpp | 0 .../src/parser/bison_parser.h | 0 .../src/parser/bison_parser.y | 0 .../src/parser/flex_lexer.cpp | 0 .../src/parser/flex_lexer.h | 0 .../src/parser/flex_lexer.l | 0 .../src/parser/keywordlist_generator.py | 0 .../src/parser/parser_typedef.h | 0 .../src/parser/sql_keywords.txt | 0 .../src/sql/AlterStatement.h | 0 .../src/sql/ColumnType.h | 2 +- .../src/sql/CreateStatement.cpp | 0 .../src/sql/CreateStatement.h | 0 .../src/sql/DeleteStatement.h | 0 .../src/sql/DropStatement.h | 0 .../src/sql/ExecuteStatement.h | 0 .../src/sql/ExportStatement.h | 0 .../sql-parser => SQLParser}/src/sql/Expr.cpp | 0 .../sql-parser => SQLParser}/src/sql/Expr.h | 0 .../src/sql/ImportStatement.h | 0 .../src/sql/InsertStatement.h | 0 .../src/sql/PrepareStatement.cpp | 0 .../src/sql/PrepareStatement.h | 0 .../src/sql/SQLStatement.cpp | 0 .../src/sql/SQLStatement.h | 2 +- .../src/sql/SelectStatement.h | 0 .../src/sql/ShowStatement.h | 0 .../sql-parser => SQLParser}/src/sql/Table.h | 0 .../src/sql/TransactionStatement.h | 0 .../src/sql/UpdateStatement.h | 0 .../src/sql/statements.cpp | 0 .../src/sql/statements.h | 0 .../src/sqlparser_win.h | 0 .../src/util/sqlhelper.cpp | 0 .../src/util/sqlhelper.h | 0 .../test/auto_query_file_test.cpp | 0 .../test/prepare_tests.cpp | 0 .../test/queries/queries-bad.sql | 0 .../test/queries/queries-good.sql | 0 .../test/queries/tpc-h-01.sql | 0 .../test/queries/tpc-h-02.sql | 0 .../test/queries/tpc-h-03.sql | 0 .../test/queries/tpc-h-04.sql | 0 .../test/queries/tpc-h-05.sql | 0 .../test/queries/tpc-h-06.sql | 0 .../test/queries/tpc-h-07.sql | 0 .../test/queries/tpc-h-08.sql | 0 .../test/queries/tpc-h-09.sql | 0 .../test/queries/tpc-h-10.sql | 0 .../test/queries/tpc-h-11.sql | 0 .../test/queries/tpc-h-12.sql | 0 .../test/queries/tpc-h-13.sql | 0 .../test/queries/tpc-h-14.sql | 0 .../test/queries/tpc-h-15.sql | 0 .../test/queries/tpc-h-16.sql | 0 .../test/queries/tpc-h-17.sql | 0 .../test/queries/tpc-h-18.sql | 0 .../test/queries/tpc-h-19.sql | 0 .../test/queries/tpc-h-20.sql | 0 .../test/queries/tpc-h-21.sql | 0 .../test/queries/tpc-h-22.sql | 0 .../test/select_tests.cpp | 0 .../test/sql_asserts.h | 0 .../test/sql_parser.cpp | 0 .../test/sql_tests.cpp | 0 .../sql-parser => SQLParser}/test/test.sh | 0 .../test/thirdparty/microtest/microtest.h | 0 .../test/tpc_h_tests.cpp | 0 Data/SQLite/CMakeLists.txt | 2 + Data/SQLite/Makefile | 2 +- Data/SQLite/SQLite.progen | 2 +- Data/SQLite/SQLite_VS90.vcproj | 12 ++-- Data/SQLite/SQLite_vs160.vcxproj | 24 +++---- Data/SQLite/SQLite_vs170.vcxproj | 36 +++++----- Data/SQLite/testsuite/Makefile | 2 +- Data/SQLite/testsuite/TestSuite.progen | 2 +- Data/SQLite/testsuite/TestSuite_VS90.vcproj | 12 ++-- Data/SQLite/testsuite/TestSuite_vs160.vcxproj | 24 +++---- Data/SQLite/testsuite/TestSuite_vs170.vcxproj | 36 +++++----- Data/extradirs | 1 + Data/include/Poco/Data/SQLParser.h | 6 +- Data/include/Poco/Data/Statement.h | 2 +- Data/samples/Binding/Binding.progen | 2 +- Data/samples/Binding/Binding_vs160.vcxproj | 24 +++---- Data/samples/Binding/Binding_vs170.vcxproj | 36 +++++----- Data/samples/RecordSet/RecordSet.progen | 2 +- .../samples/RecordSet/RecordSet_vs160.vcxproj | 24 +++---- .../samples/RecordSet/RecordSet_vs170.vcxproj | 36 +++++----- Data/samples/RowFormatter/RowFormatter.progen | 2 +- .../RowFormatter/RowFormatter_vs160.vcxproj | 24 +++---- .../RowFormatter/RowFormatter_vs170.vcxproj | 36 +++++----- Data/samples/Tuple/Tuple.progen | 2 +- Data/samples/Tuple/Tuple_vs160.vcxproj | 24 +++---- Data/samples/Tuple/Tuple_vs170.vcxproj | 36 +++++----- Data/samples/TypeHandler/TypeHandler.progen | 2 +- .../TypeHandler/TypeHandler_vs160.vcxproj | 24 +++---- .../TypeHandler/TypeHandler_vs170.vcxproj | 36 +++++----- Data/samples/WebNotifier/WebNotifier.progen | 2 +- .../WebNotifier/WebNotifier_vs160.vcxproj | 24 +++---- .../WebNotifier/WebNotifier_vs170.vcxproj | 36 +++++----- .../testsuite/DataTest/DataTest_vs160.vcxproj | 24 +++---- .../testsuite/DataTest/DataTest_vs170.vcxproj | 36 +++++----- Data/testsuite/DataTest/Makefile | 2 +- Data/testsuite/Makefile-testrunner | 2 +- PocoDoc/cfg/mkdoc-poco.xml | 2 +- build/rules/compile | 2 +- release/script/mkrelease | 18 ----- 167 files changed, 780 insertions(+), 792 deletions(-) rename Data/{src/sql-parser => SQLParser}/LICENSE (100%) rename Data/{src/sql-parser => SQLParser}/Makefile (100%) rename Data/{src/sql-parser => SQLParser}/README.md (100%) rename Data/{src/sql-parser => SQLParser}/benchmark/README.md (100%) rename Data/{src/sql-parser => SQLParser}/benchmark/benchmark.cpp (100%) rename Data/{src/sql-parser => SQLParser}/benchmark/benchmark_utils.cpp (100%) rename Data/{src/sql-parser => SQLParser}/benchmark/benchmark_utils.h (100%) rename Data/{src/sql-parser => SQLParser}/benchmark/parser_benchmark.cpp (100%) rename Data/{src/sql-parser => SQLParser}/benchmark/queries.cpp (100%) rename Data/{src/sql-parser => SQLParser}/benchmark/queries.h (100%) rename Data/{src/sql-parser => SQLParser}/src/SQLParser.cpp (100%) rename Data/{src/sql-parser => SQLParser}/src/SQLParser.h (100%) rename Data/{src/sql-parser => SQLParser}/src/SQLParserResult.cpp (100%) rename Data/{src/sql-parser => SQLParser}/src/SQLParserResult.h (100%) rename Data/{src/sql-parser => SQLParser}/src/parser/.gitignore (100%) rename Data/{src/sql-parser => SQLParser}/src/parser/Makefile (100%) rename Data/{src/sql-parser => SQLParser}/src/parser/bison_parser.cpp (100%) rename Data/{src/sql-parser => SQLParser}/src/parser/bison_parser.h (100%) rename Data/{src/sql-parser => SQLParser}/src/parser/bison_parser.y (100%) rename Data/{src/sql-parser => SQLParser}/src/parser/flex_lexer.cpp (100%) rename Data/{src/sql-parser => SQLParser}/src/parser/flex_lexer.h (100%) rename Data/{src/sql-parser => SQLParser}/src/parser/flex_lexer.l (100%) rename Data/{src/sql-parser => SQLParser}/src/parser/keywordlist_generator.py (100%) rename Data/{src/sql-parser => SQLParser}/src/parser/parser_typedef.h (100%) rename Data/{src/sql-parser => SQLParser}/src/parser/sql_keywords.txt (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/AlterStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/ColumnType.h (95%) rename Data/{src/sql-parser => SQLParser}/src/sql/CreateStatement.cpp (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/CreateStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/DeleteStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/DropStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/ExecuteStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/ExportStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/Expr.cpp (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/Expr.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/ImportStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/InsertStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/PrepareStatement.cpp (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/PrepareStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/SQLStatement.cpp (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/SQLStatement.h (95%) rename Data/{src/sql-parser => SQLParser}/src/sql/SelectStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/ShowStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/Table.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/TransactionStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/UpdateStatement.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/statements.cpp (100%) rename Data/{src/sql-parser => SQLParser}/src/sql/statements.h (100%) rename Data/{src/sql-parser => SQLParser}/src/sqlparser_win.h (100%) rename Data/{src/sql-parser => SQLParser}/src/util/sqlhelper.cpp (100%) rename Data/{src/sql-parser => SQLParser}/src/util/sqlhelper.h (100%) rename Data/{src/sql-parser => SQLParser}/test/auto_query_file_test.cpp (100%) rename Data/{src/sql-parser => SQLParser}/test/prepare_tests.cpp (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/queries-bad.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/queries-good.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-01.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-02.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-03.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-04.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-05.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-06.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-07.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-08.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-09.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-10.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-11.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-12.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-13.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-14.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-15.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-16.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-17.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-18.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-19.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-20.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-21.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/queries/tpc-h-22.sql (100%) rename Data/{src/sql-parser => SQLParser}/test/select_tests.cpp (100%) rename Data/{src/sql-parser => SQLParser}/test/sql_asserts.h (100%) rename Data/{src/sql-parser => SQLParser}/test/sql_parser.cpp (100%) rename Data/{src/sql-parser => SQLParser}/test/sql_tests.cpp (100%) rename Data/{src/sql-parser => SQLParser}/test/test.sh (100%) rename Data/{src/sql-parser => SQLParser}/test/thirdparty/microtest/microtest.h (100%) rename Data/{src/sql-parser => SQLParser}/test/tpc_h_tests.cpp (100%) create mode 100644 Data/extradirs diff --git a/ActiveRecord/ActiveRecord.progen b/ActiveRecord/ActiveRecord.progen index 3862b7c1a..3b67b77e8 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;..\\Data\\SQLParser;..\\Data\\SQLParser\\src 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 1ee839cb0..a3fafa612 100644 --- a/ActiveRecord/ActiveRecord_vs160.vcxproj +++ b/ActiveRecord/ActiveRecord_vs160.vcxproj @@ -227,7 +227,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -260,7 +260,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -289,7 +289,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -316,7 +316,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -337,7 +337,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -364,7 +364,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -386,7 +386,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -419,7 +419,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -448,7 +448,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -475,7 +475,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -496,7 +496,7 @@ Disabled - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -523,7 +523,7 @@ true Speed true - .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/ActiveRecord/ActiveRecord_vs170.vcxproj b/ActiveRecord/ActiveRecord_vs170.vcxproj index 6637aae27..d6034de72 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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(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;..\Data\SQLParser;..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/ActiveRecord/CMakeLists.txt b/ActiveRecord/CMakeLists.txt index ad39171e7..b77a83696 100644 --- a/ActiveRecord/CMakeLists.txt +++ b/ActiveRecord/CMakeLists.txt @@ -26,7 +26,8 @@ target_include_directories(ActiveRecord PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Data/SQLParser + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Data/SQLParser/src ) POCO_INSTALL(ActiveRecord) diff --git a/ActiveRecord/testsuite/TestSuite.progen b/ActiveRecord/testsuite/TestSuite.progen index a13c41243..b57b484db 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\\SQLParser;..\\Data\\SQLParser\\src; \ ..\\..\\Data\\SQLite\\include;..\\..\\ActiveRecord\\include;.\\include diff --git a/ActiveRecord/testsuite/TestSuite_vs160.vcxproj b/ActiveRecord/testsuite/TestSuite_vs160.vcxproj index 08cacbce7..d87dc9871 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 7fae30584..baadba6fc 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/testsuite/src/CppParserTest.cpp b/CppParser/testsuite/src/CppParserTest.cpp index b200ca145..c63f4c60a 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/Data/CMakeLists.txt b/Data/CMakeLists.txt index d795073c3..64249f75e 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() @@ -43,7 +43,8 @@ target_include_directories(Data $ $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/SQLParser + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/SQLParser/src ) POCO_INSTALL(Data) diff --git a/Data/Data_VS90.vcproj b/Data/Data_VS90.vcproj index 7ee4df50e..d873ec40e 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 276468518..2bbd24b7f 100644 --- a/Data/Data_vs160.vcxproj +++ b/Data/Data_vs160.vcxproj @@ -606,31 +606,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -723,34 +723,34 @@ true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true diff --git a/Data/Data_vs160.vcxproj.filters b/Data/Data_vs160.vcxproj.filters index 16ff21640..7b4064455 100644 --- a/Data/Data_vs160.vcxproj.filters +++ b/Data/Data_vs160.vcxproj.filters @@ -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 9f5a2d888..4db9f9293 100644 --- a/Data/Data_vs170.vcxproj +++ b/Data/Data_vs170.vcxproj @@ -921,31 +921,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1098,52 +1098,52 @@ stdcpp17 stdc11 - + true stdcpp17 stdc11 - + true stdcpp17 stdc11 - + 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 274357ea5..0c8d1f19d 100644 --- a/Data/Data_vs170.vcxproj.filters +++ b/Data/Data_vs170.vcxproj.filters @@ -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 ba47e0276..a01ca61e2 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 ce411cfea..dc417632f 100644 --- a/Data/MySQL/CMakeLists.txt +++ b/Data/MySQL/CMakeLists.txt @@ -26,7 +26,8 @@ target_include_directories(DataMySQL PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser/src ) target_compile_definitions(DataMySQL PUBLIC THREADSAFE NO_TCL) diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile index b199db03c..31f6868ec 100644 --- a/Data/MySQL/Makefile +++ b/Data/MySQL/Makefile @@ -16,7 +16,7 @@ objects = Binder Extractor SessionImpl Connector \ SessionHandle StatementExecutor Utility 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 = PocoDataMySQL diff --git a/Data/MySQL/MySQL_VS90.vcproj b/Data/MySQL/MySQL_VS90.vcproj index 5399c652d..75e5dc140 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 a316b4941..917d6ddc5 100644 --- a/Data/MySQL/MySQL_vs160.vcxproj +++ b/Data/MySQL/MySQL_vs160.vcxproj @@ -227,7 +227,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -260,7 +260,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -289,7 +289,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -316,7 +316,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreaded @@ -337,7 +337,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -364,7 +364,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -386,7 +386,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -419,7 +419,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -448,7 +448,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -475,7 +475,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreaded @@ -496,7 +496,7 @@ Disabled - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -523,7 +523,7 @@ true Speed true - .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/MySQL/MySQL_vs170.vcxproj b/Data/MySQL/MySQL_vs170.vcxproj index 146c91962..c22e865c3 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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;..\..\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 a8c59defc..f07a04328 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_VS90.vcproj b/Data/MySQL/testsuite/TestSuite_VS90.vcproj index 84d1c7f37..bcbdc3e83 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 7a876ee85..083638b4e 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/ODBC/CMakeLists.txt b/Data/ODBC/CMakeLists.txt index 764f6a501..38d5b2d2a 100644 --- a/Data/ODBC/CMakeLists.txt +++ b/Data/ODBC/CMakeLists.txt @@ -26,7 +26,8 @@ target_include_directories(DataODBC PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser/src ) target_compile_definitions(DataODBC PUBLIC THREADSAFE) diff --git a/Data/ODBC/Makefile b/Data/ODBC/Makefile index 9be4700cf..3e4980154 100644 --- a/Data/ODBC/Makefile +++ b/Data/ODBC/Makefile @@ -14,7 +14,7 @@ objects = Binder ConnectionHandle Connector EnvironmentHandle \ target_includes = $(POCO_BASE)/Data/testsuite/include 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 = PocoDataODBC diff --git a/Data/ODBC/ODBC.progen b/Data/ODBC/ODBC.progen index 05f759a12..d1b55ed2c 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;..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src 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 656632804..820474a74 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 9a398a943..21922adb1 100644 --- a/Data/ODBC/ODBC_vs160.vcxproj +++ b/Data/ODBC/ODBC_vs160.vcxproj @@ -227,7 +227,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -261,7 +261,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -291,7 +291,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -318,7 +318,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -339,7 +339,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -366,7 +366,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -389,7 +389,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -423,7 +423,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -453,7 +453,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -480,7 +480,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -501,7 +501,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -528,7 +528,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/ODBC_vs170.vcxproj b/Data/ODBC/ODBC_vs170.vcxproj index 45ad082c3..bfd3495dd 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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/Makefile b/Data/ODBC/testsuite/Makefile index b17f82c86..2a311ad4b 100644 --- a/Data/ODBC/testsuite/Makefile +++ b/Data/ODBC/testsuite/Makefile @@ -36,8 +36,7 @@ ifeq ($(POCO_CONFIG),MinGW) endif ifndef POCO_DATA_NO_SQL_PARSER - target_includes += $(POCO_BASE)/Data/src -endif + target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src target = testrunner target_version = 1 diff --git a/Data/ODBC/testsuite/TestSuite.progen b/Data/ODBC/testsuite/TestSuite.progen index ad611e51d..2c2d3e34e 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\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\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 40f218e0f..5eca7e5fd 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 e08e2efe2..7a23c7c28 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 d02c2f106..721580886 100644 --- a/Data/PostgreSQL/CMakeLists.txt +++ b/Data/PostgreSQL/CMakeLists.txt @@ -26,8 +26,8 @@ target_include_directories(DataPostgreSQL PUBLIC $ $ - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/src + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Data/SQLParser + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Data/SQLParser/src ) POCO_INSTALL(DataPostgreSQL) diff --git a/Data/PostgreSQL/Makefile b/Data/PostgreSQL/Makefile index 6cd726679..bf2539d6f 100644 --- a/Data/PostgreSQL/Makefile +++ b/Data/PostgreSQL/Makefile @@ -15,7 +15,7 @@ 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 + target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src endif diff --git a/Data/PostgreSQL/PostgreSQL_VS90.vcproj b/Data/PostgreSQL/PostgreSQL_VS90.vcproj index 59e2aca3f..78686f6f7 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 b181f8cc3..bcb42a61d 100644 --- a/Data/PostgreSQL/PostgreSQL_vs160.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs160.vcxproj @@ -227,7 +227,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -260,7 +260,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -289,7 +289,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -316,7 +316,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -337,7 +337,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -364,7 +364,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -386,7 +386,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -419,7 +419,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -448,7 +448,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -475,7 +475,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -496,7 +496,7 @@ Disabled - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -523,7 +523,7 @@ true Speed true - .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/PostgreSQL/PostgreSQL_vs170.vcxproj b/Data/PostgreSQL/PostgreSQL_vs170.vcxproj index 30417e18b..464a4d53b 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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/PostgreSQL/testsuite/Makefile b/Data/PostgreSQL/testsuite/Makefile index 5b3754f86..989842919 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_VS90.vcproj b/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj index 205430f49..8d146be7e 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 cad20efca..1aed740d9 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 6eb9ed470..d756e2462 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 b0763f83e..c0aa1e472 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/CMakeLists.txt b/Data/SQLite/CMakeLists.txt index 263acc1ad..e6a008742 100644 --- a/Data/SQLite/CMakeLists.txt +++ b/Data/SQLite/CMakeLists.txt @@ -40,6 +40,8 @@ target_include_directories(DataSQLite $ $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser/src ) if(POCO_UNBUNDLED) diff --git a/Data/SQLite/Makefile b/Data/SQLite/Makefile index c6a67219d..de563d7dd 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 aae7329fa..5d14b0d5b 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;..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src 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 10d03ec23..0f7bd0856 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 a3451a702..3d4e0b826 100644 --- a/Data/SQLite/SQLite_vs160.vcxproj +++ b/Data/SQLite/SQLite_vs160.vcxproj @@ -227,7 +227,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 @@ -261,7 +261,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 @@ -291,7 +291,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 @@ -319,7 +319,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 @@ -341,7 +341,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 @@ -369,7 +369,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 @@ -392,7 +392,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 @@ -426,7 +426,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 @@ -456,7 +456,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 @@ -484,7 +484,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 @@ -506,7 +506,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 @@ -534,7 +534,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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 b/Data/SQLite/SQLite_vs170.vcxproj index d4c542876..ea143bb80 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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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;..\..\Data\SQLParser;..\..\Data\SQLParser\src;%(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/testsuite/Makefile b/Data/SQLite/testsuite/Makefile index 5f8fcad7c..58ab790a1 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 c0784b935..43c1986d4 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;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/SQLite/testsuite/TestSuite_VS90.vcproj b/Data/SQLite/testsuite/TestSuite_VS90.vcproj index af17fce99..76508a1c0 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 b9f742330..401b89f37 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 000000000..e27d52a22 --- /dev/null +++ b/Data/extradirs @@ -0,0 +1 @@ +SQLParser diff --git a/Data/include/Poco/Data/SQLParser.h b/Data/include/Poco/Data/SQLParser.h index f86729d6b..5d4fd42d6 100644 --- a/Data/include/Poco/Data/SQLParser.h +++ b/Data/include/Poco/Data/SQLParser.h @@ -23,9 +23,9 @@ #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" +#include "src/SQLParser.h" +#include "SQLParserResult.h" +#include "util/sqlhelper.h" namespace Poco { diff --git a/Data/include/Poco/Data/Statement.h b/Data/include/Poco/Data/Statement.h index 7aeba69b3..1b300e91f 100644 --- a/Data/include/Poco/Data/Statement.h +++ b/Data/include/Poco/Data/Statement.h @@ -24,7 +24,7 @@ #include "Poco/Data/Range.h" #include "Poco/Data/Bulk.h" #include "Poco/Data/Row.h" -#include "Poco/Data/SQLParser.h" +#include "SQLParser.h" #include "Poco/Data/SimpleRowFormatter.h" #include "Poco/SharedPtr.h" #include "Poco/Mutex.h" diff --git a/Data/samples/Binding/Binding.progen b/Data/samples/Binding/Binding.progen index a3dd5dfdd..3d17f1e88 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 feb0a75d4..5f63a84fe 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 9a6fd0337..bd6a2d007 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 a3dd5dfdd..3d17f1e88 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 05a06154c..ef1dca08e 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 580f58f9c..08f11314a 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 a3dd5dfdd..3d17f1e88 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 687b4b249..5e6ad3f2f 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 2517ce024..42112adae 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 a3dd5dfdd..3d17f1e88 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 ddf3aa8c3..55ddb33b4 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 91ec3a2a3..32c4718ef 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 96965a6ce..ca2cc01c4 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 13e837f9d..5be4b88ae 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 bbb95405c..c618031dc 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 7d8738bb1..d3a2dbca0 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 ae6764c50..33e4a1dc0 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 79b166193..4fd1fc901 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/testsuite/DataTest/DataTest_vs160.vcxproj b/Data/testsuite/DataTest/DataTest_vs160.vcxproj index 47ab9627b..496803f71 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 7f9b4389c..4a0bf04d6 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 61a309c7b..e84fc2454 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 9964afe64..4907edc38 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/PocoDoc/cfg/mkdoc-poco.xml b/PocoDoc/cfg/mkdoc-poco.xml index 841c4aae3..790ab37c4 100644 --- a/PocoDoc/cfg/mkdoc-poco.xml +++ b/PocoDoc/cfg/mkdoc-poco.xml @@ -7,7 +7,7 @@ ${PocoBuild}/*/include/Poco/*/*/*.h ${PocoBuild}/*/include/Poco/*/*.h ${PocoBuild}/*/*/include/Poco/*/*/*.h - ${PocoBuild}/Data/src/sql-parser/*.h + ${PocoBuild}/Data/SQLParser/*.h *_*.h, diff --git a/build/rules/compile b/build/rules/compile index 5f2b41261..9dbebaa5c 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/release/script/mkrelease b/release/script/mkrelease index 37a702695..3062b55a2 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 #