From 0e7d44bf63febe3fe9cd141e0ef690ff9d56e55f Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Tue, 4 Mar 2025 19:05:05 +0100 Subject: [PATCH] MAINT: Switch SOCI submodule back to pointing to upstream This is better than using a custom fork --- 3rdparty/soci | 2 +- src/database/CMakeLists.txt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/3rdparty/soci b/3rdparty/soci index 09e911887..eb6958b92 160000 --- a/3rdparty/soci +++ b/3rdparty/soci @@ -1 +1 @@ -Subproject commit 09e9118875392373083773fb3b63c7a678c53dbc +Subproject commit eb6958b92e168285f436acb9687f8d2cc26c4105 diff --git a/src/database/CMakeLists.txt b/src/database/CMakeLists.txt index 53fa1a068..ac1b1512a 100644 --- a/src/database/CMakeLists.txt +++ b/src/database/CMakeLists.txt @@ -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 "")