diff options
| author | Callum Prentice <callum@gmail.com> | 2020-09-22 16:52:10 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-09-22 16:52:10 -0700 |
| commit | 5858bb87c7d9d222e61c7c4f7f0f1dc8ba02c77f (patch) | |
| tree | e1292b9fe88ff7d6b555122751c4b1c76c4c5d03 /indra | |
| parent | 38faec3b11d27c2f88b89283fe1a3a60d6ec4e42 (diff) | |
Add SQLite third package to this viewer and pull in the most recent build (3.33)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/SQLite.cmake | 11 | ||||
| -rw-r--r-- | indra/llfilesystem/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 |
5 files changed, 27 insertions, 0 deletions
diff --git a/indra/cmake/SQLite.cmake b/indra/cmake/SQLite.cmake new file mode 100644 index 0000000000..3571ca7d1e --- /dev/null +++ b/indra/cmake/SQLite.cmake @@ -0,0 +1,11 @@ +# -*- 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 4af14d6d3a..306b483097 100644 --- a/indra/llfilesystem/CMakeLists.txt +++ b/indra/llfilesystem/CMakeLists.txt @@ -4,11 +4,13 @@ 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 @@ -67,6 +69,7 @@ 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 9fe89c1a19..129e436d5f 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -48,6 +48,7 @@ include(OPENAL) include(OpenGL) include(OpenSSL) include(PNG) +include(SQLite) include(TemplateCheck) include(UI) include(UnixInstall) @@ -70,6 +71,7 @@ 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 eca5aafa55..6181683b9e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -130,6 +130,7 @@ #if !LL_LINUX #include "cef/dullahan_version.h" #include "vlc/libvlc_version.h" +#include "sqlite3.h" #endif // LL_LINUX // Third party library includes @@ -3179,6 +3180,15 @@ 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 03aed8aa7e..bca577c48a 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -62,6 +62,7 @@ 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] |