Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old remaining sqlite3 references. #3350

Merged
merged 1 commit into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion AutoSave/AutoSave.project
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down
15 changes: 0 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -866,11 +866,6 @@ if(APPLE)
add_definitions(-mmacosx-version-min=10.8)
endif()

if(NOT SQLite3_FOUND)
# On Linux, we use the distro's libsqlite3
add_subdirectory(sqlite3)
endif()

# add the dtl module include path before we include Plugin folder
include_directories(dtl)

Expand Down Expand Up @@ -978,16 +973,6 @@ else()
add_subdirectory(codelite_echo)
add_subdirectory(ctagsd)

#
# Setup the proper dependencies
#
if(NOT SQLite3_FOUND)
if(USE_PCH AND NOT MINGW)
add_dependencies(sqlite3lib ${CL_PCH_TARGET})
endif()
add_dependencies(wxsqlite3 sqlite3lib)
endif()

add_subdirectory(LiteEditor)
add_dependencies(databaselayersqlite wxsqlite3)
add_dependencies(wxshapeframework wxsqlite3)
Expand Down
3 changes: 0 additions & 3 deletions CMakePlugin/CMakePlugin.project
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@
<IncludePath Value="..//Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
</Compiler>
<Linker Options="-O2;$(shell wx-config --libs --unicode=yes);" Required="yes">
Expand Down Expand Up @@ -227,7 +226,6 @@
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../LiteEditor"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="__WX__"/>
Expand Down Expand Up @@ -287,7 +285,6 @@
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../LiteEditor"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
</Compiler>
Expand Down
1 change: 0 additions & 1 deletion CallGraph/CallGraph.project
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down
1 change: 0 additions & 1 deletion CodeLite/CodeLite.project
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,6 @@
<Project Name="PCH"/>
</Dependencies>
<Dependencies Name="Win_x64_Release">
<Project Name="sqlite3"/>
<Project Name="wxsqlite3"/>
<Project Name="dapcxx"/>
<Project Name="ctagsdlib"/>
Expand Down
1 change: 0 additions & 1 deletion CodeLiteDiff/CodeLiteDiff.project
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down
1 change: 0 additions & 1 deletion CommentParser/CommentParser/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
int main(int argc, char **argv)
{
CommentParseResult comments;
// ParseComments("C:\\Users\\eran\\src\\Development\\C++\\codelite\\CL_trunk\\sqlite3\\sqlite3.h", comments);
ParseComments("../test.h", comments);

comments.print();
Expand Down
3 changes: 0 additions & 3 deletions ContinuousBuild/ContinuousBuild.project
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
</Compiler>
<Linker Options="-O2;$(shell wx-config --libs --unicode=yes);" Required="yes">
Expand Down Expand Up @@ -204,7 +203,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down Expand Up @@ -266,7 +264,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
</Compiler>
Expand Down
3 changes: 0 additions & 3 deletions Copyright/Copyright.project
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
</Compiler>
<Linker Options="-O2;$(shell wx-config --libs --unicode=yes);" Required="yes">
Expand Down Expand Up @@ -188,7 +187,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down Expand Up @@ -250,7 +248,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
</Compiler>
Expand Down
1 change: 0 additions & 1 deletion DebugAdapterClient/DebugAdapterClient.project
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<IncludePath Value="../wxdap"/>
Expand Down
1 change: 0 additions & 1 deletion Debugger/DebuggerGDB.project
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down
1 change: 0 additions & 1 deletion Docker/Docker.project
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down
1 change: 0 additions & 1 deletion EOSWiki/EOSWiki.project
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down
1 change: 0 additions & 1 deletion EditorConfigPlugin/EditorConfigPlugin.project
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down
3 changes: 0 additions & 3 deletions ExternalTools/ExternalTools.project
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
</Compiler>
<Linker Options="-O2;$(shell wx-config --libs --unicode=yes);" Required="yes">
Expand Down Expand Up @@ -198,7 +197,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down Expand Up @@ -259,7 +257,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
</Compiler>
Expand Down
1 change: 0 additions & 1 deletion Gizmos/Gizmos.project
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down
1 change: 0 additions & 1 deletion HelpPlugin/HelpPlugin.project
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
<IncludePath Value="../Plugin"/>
<IncludePath Value="../sqlite3"/>
<IncludePath Value="../sdk/wxsqlite3/include"/>
<IncludePath Value="../PCH"/>
<Preprocessor Value="WXUSINGDLL_SDK"/>
Expand Down
Loading