Remove SQLite from project and we are now not going to use it for the cache

5 files changed, 0 insertions, 27 deletions

diff --git a/indra/cmake/SQLite.cmake b/indra/cmake/SQLite.cmake
deleted file mode 100644
index 3571ca7d1e..0000000000
--- a/indra/cmake/SQLite.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-if (USESYSTEMLIBS)
-  include(FindPkgConfig)
-  pkg_check_modules(SQLITE REQUIRED sqlite3)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(sqlite)
-  set(SQLITE_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/sqlite/)
-  set(SQLITE_LIBRARIES sqlite)
-endif (USESYSTEMLIBS)
diff --git a/indra/llfilesystem/CMakeLists.txt b/indra/llfilesystem/CMakeLists.txt
index d1dece5bba..09c4c33ebf 100644
--- a/indra/llfilesystem/CMakeLists.txt
+++ b/indra/llfilesystem/CMakeLists.txt
@@ -4,13 +4,11 @@ project(llfilesystem)
 
 include(00-Common)
 include(LLCommon)
-include(SQLite)
 include(UnixInstall)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
-    ${SQLITE_INCLUDE_DIR}
     )
 
 set(llfilesystem_SOURCE_FILES
@@ -70,7 +68,6 @@ set(cache_BOOST_LIBRARIES
 target_link_libraries(llfilesystem
     ${LLCOMMON_LIBRARIES}
     ${cache_BOOST_LIBRARIES}
-    ${SQLITE_LIBRARIES}
     )
 
 if (DARWIN)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 129e436d5f..9fe89c1a19 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -48,7 +48,6 @@ include(OPENAL)
 include(OpenGL)
 include(OpenSSL)
 include(PNG)
-include(SQLite)
 include(TemplateCheck)
 include(UI)
 include(UnixInstall)
@@ -71,7 +70,6 @@ include_directories(
     ${DBUSGLIB_INCLUDE_DIRS}
     ${JSONCPP_INCLUDE_DIR}
     ${GLOD_INCLUDE_DIR}
-    ${SQLITE_INCLUDE_DIR}
     ${LLAUDIO_INCLUDE_DIRS}
     ${LLCHARACTER_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 3a99c5a464..0d25cb6dc8 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -131,7 +131,6 @@
 #if !LL_LINUX
 #include "cef/dullahan_version.h"
 #include "vlc/libvlc_version.h"
-#include "sqlite3.h"
 #endif // LL_LINUX
 
 // Third party library includes
@@ -3161,15 +3160,6 @@ LLSD LLAppViewer::getViewerInfo() const
 #endif
 
 #if !LL_LINUX
-    std::ostringstream sqlite_ver_codec;
-    sqlite_ver_codec << "SQLite: ";
-    sqlite_ver_codec << SQLITE_VERSION;
-    info["SQLITE_VERSION"] = sqlite_ver_codec.str();
-#else
-    info["SQLITE_VERSION"] = "Undefined";
-#endif
-
-#if !LL_LINUX
 	std::ostringstream vlc_ver_codec;
 	vlc_ver_codec << LIBVLC_VERSION_MAJOR;
 	vlc_ver_codec << ".";
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index bca577c48a..03aed8aa7e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -62,7 +62,6 @@ HiDPI display mode: [HIDPI]
 	<string name="AboutLibs">
 J2C Decoder Version: [J2C_VERSION]
 Audio Driver Version: [AUDIO_DRIVER_VERSION]
-[SQLITE_VERSION]
 [LIBCEF_VERSION]
 LibVLC Version: [LIBVLC_VERSION]
 Voice Server Version: [VOICE_VERSION]