diff --git a/Data/SQLite/testsuite/TestSuite_VS71.vcproj b/Data/SQLite/testsuite/TestSuite_VS71.vcproj index 1ec2678dc..a1641762b 100644 --- a/Data/SQLite/testsuite/TestSuite_VS71.vcproj +++ b/Data/SQLite/testsuite/TestSuite_VS71.vcproj @@ -22,7 +22,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="TRUE" MinimalRebuild="TRUE" BasicRuntimeChecks="3" @@ -87,7 +87,7 @@ OmitFramePointers="TRUE" OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="TRUE" RuntimeLibrary="2" BufferSecurityCheck="FALSE" @@ -147,7 +147,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="TRUE" MinimalRebuild="TRUE" BasicRuntimeChecks="3" @@ -213,7 +213,7 @@ OmitFramePointers="TRUE" OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="TRUE" RuntimeLibrary="0" BufferSecurityCheck="FALSE" @@ -274,7 +274,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="TRUE" MinimalRebuild="TRUE" BasicRuntimeChecks="3" @@ -339,7 +339,7 @@ OmitFramePointers="TRUE" OptimizeForWindowsApplication="TRUE" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="TRUE" RuntimeLibrary="2" BufferSecurityCheck="FALSE" diff --git a/Data/SQLite/testsuite/TestSuite_VS80.vcproj b/Data/SQLite/testsuite/TestSuite_VS80.vcproj index bb0e0a277..1e01fc903 100644 --- a/Data/SQLite/testsuite/TestSuite_VS80.vcproj +++ b/Data/SQLite/testsuite/TestSuite_VS80.vcproj @@ -33,7 +33,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -105,7 +105,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" BufferSecurityCheck="false" @@ -171,7 +171,7 @@ Name="VCCLCompilerTool" Optimization="4" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -244,7 +244,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" BufferSecurityCheck="false" @@ -311,7 +311,7 @@ Name="VCCLCompilerTool" Optimization="4" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -383,7 +383,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" BufferSecurityCheck="false" diff --git a/Data/SQLite/testsuite/TestSuite_VS90.vcproj b/Data/SQLite/testsuite/TestSuite_VS90.vcproj index 7ae6a6054..e7db76a1b 100644 --- a/Data/SQLite/testsuite/TestSuite_VS90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_VS90.vcproj @@ -33,7 +33,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -105,7 +105,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" BufferSecurityCheck="false" @@ -171,7 +171,7 @@ Name="VCCLCompilerTool" Optimization="4" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -244,7 +244,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" BufferSecurityCheck="false" @@ -311,7 +311,7 @@ Name="VCCLCompilerTool" Optimization="4" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -383,7 +383,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" BufferSecurityCheck="false" diff --git a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj index 446f363a3..337fa1e42 100644 --- a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj @@ -115,7 +115,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true EnableFastChecks @@ -149,7 +149,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -177,7 +177,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -212,7 +212,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false @@ -241,7 +241,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -275,7 +275,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL false diff --git a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj index c6bd69faa..046e6d2dc 100644 --- a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj @@ -121,7 +121,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true EnableFastChecks @@ -155,7 +155,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -183,7 +183,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -218,7 +218,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false @@ -247,7 +247,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -281,7 +281,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL false diff --git a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj index 4f857395e..9184c23dd 100644 --- a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj @@ -121,7 +121,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true EnableFastChecks @@ -155,7 +155,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -183,7 +183,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -218,7 +218,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false @@ -247,7 +247,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -281,7 +281,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj index f85b7fad3..2683eed43 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj @@ -115,7 +115,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true EnableFastChecks @@ -149,7 +149,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -177,7 +177,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -212,7 +212,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false @@ -241,7 +241,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -275,7 +275,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj index 9bdd9edf1..28845ab6e 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj @@ -121,7 +121,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true EnableFastChecks @@ -155,7 +155,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -183,7 +183,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -218,7 +218,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false @@ -247,7 +247,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -281,7 +281,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj index b46941382..7d9cefea8 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj @@ -121,7 +121,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true EnableFastChecks @@ -155,7 +155,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -183,7 +183,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -218,7 +218,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false @@ -247,7 +247,7 @@ Disabled ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -281,7 +281,7 @@ Speed true ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj index bfc7c129c..decd1cf0f 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj @@ -33,7 +33,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -105,7 +105,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" BufferSecurityCheck="false" @@ -171,7 +171,7 @@ Name="VCCLCompilerTool" Optimization="4" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -244,7 +244,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" BufferSecurityCheck="false" @@ -311,7 +311,7 @@ Name="VCCLCompilerTool" Optimization="4" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -383,7 +383,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" + PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" BufferSecurityCheck="false" diff --git a/Data/SQLite/testsuite/src/SQLiteTest.cpp b/Data/SQLite/testsuite/src/SQLiteTest.cpp index 1d392906b..423d919af 100644 --- a/Data/SQLite/testsuite/src/SQLiteTest.cpp +++ b/Data/SQLite/testsuite/src/SQLiteTest.cpp @@ -3287,11 +3287,9 @@ void SQLiteTest::testTransactor() } -#ifdef POCO_DATA_SQLITE_FTS - - void SQLiteTest::testFTS3() { +#ifdef SQLITE_ENABLE_FTS3 Session session(Poco::Data::SQLite::Connector::KEY, "dummy.db"); assert(session.isConnected()); @@ -3328,12 +3326,12 @@ void SQLiteTest::testFTS3() docid = 0; session << "SELECT count(*) FROM docs WHERE docs MATCH 'database and sqlite'", into(docid), now; assert(docid == 0); +#else + std::cout << "SQLite FTS not enabled, test not executed." << std::endl; +#endif // SQLITE_ENABLE_FTS3 } -#endif // POCO_DATA_SQLITE_FTS - - void SQLiteTest::setUp() { } diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h index adc6dd0a7..19efc6263 100644 --- a/Foundation/include/Poco/Config.h +++ b/Foundation/include/Poco/Config.h @@ -176,10 +176,6 @@ // #define POCO_NET_NO_IPv6 -// Enable SQLite Full Text Search -#define POCO_DATA_SQLITE_FTS - - // Windows CE has no locale support #if defined(_WIN32_WCE) #define POCO_NO_LOCALE