mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

MAINT: Switch SOCI submodule back to pointing to upstream

Browse Source 
This is better than using a custom fork
This commit is contained in:
Robert Adam 2025-03-04 19:05:05 +01:00
parent cc148d0cd9
commit 0e7d44bf63
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/soci vendored

@ -1 +1 @@
Subproject commit 09e9118875392373083773fb3b63c7a678c53dbc
Subproject commit eb6958b92e168285f436acb9687f8d2cc26c4105

2
src/database/CMakeLists.txt
View File

@ -47,7 +47,6 @@ if (bundled-soci)
set(SOCI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/soci)
set(SOCI_SHARED OFF CACHE BOOL "" FORCE)
set(SOCI_TESTS OFF CACHE BOOL "" FORCE)
set(SOCI_LTO ${lto} CACHE BOOL "" FORCE)
set(SOCI_DB2 OFF CACHE BOOL "" FORCE)
set(SOCI_FIREBIRD OFF CACHE BOOL "" FORCE)
@ -61,7 +60,6 @@ if (bundled-soci)
add_subdirectory("${3RDPARTY_DIR}/soci" "${SOCI_BINARY_DIR}" EXCLUDE_FROM_ALL)
disable_warnings_for_all_targets_in("${3RDPARTY_DIR}/soci")
else()
# Only Soci 4.1 introduces the general BLOB operations that we require
set(components "")