Remove SQLite from project and we are now not going to use it for the cache
parent
3092aa8aae
commit
56e3061553
|
|
@ -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)
|
||||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -3160,15 +3159,6 @@ LLSD LLAppViewer::getViewerInfo() const
|
|||
info["LIBCEF_VERSION"] = "Undefined";
|
||||
#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;
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
Loading…
Reference in New Issue