Update changes after cpp-sqlite removal

Author: ericriff

3rdparty/cpp-sqlite/CMakeLists.txt

@@ -19,7 +19,6 @@ option(USE_AFLPLUSPLUS "Use AFL++ instead of libFuzzer" OFF)
 option(ENABLE_DEBUG "Enable debug build with full symbols" OFF)
 option(FORCE_STATIC_LINKING "Force static linking of all dependencies" OFF)
 
-option(USE_VENDORED_CPPSQLITE "Use the bundled version of cpp-sqlite" ON)
 option(USE_VENDORED_CPPZMQ "Use the bundled version of cppzmq" ON)
 option(USE_VENDORED_FLATBUFFERS "Use the bundled version of flatbuffers" ON)
 option(USE_VENDORED_LEXY "Use the bundled version of lexy" ON)
@@ -109,11 +108,7 @@ if(BTCPP_GROOT_INTERFACE)
 endif()
 
 if(BTCPP_SQLITE_LOGGING)
-    if(USE_VENDORED_CPPSQLITE)
-        add_subdirectory(3rdparty/cpp-sqlite)
-    else()
-        find_package(cpp-sqlite REQUIRED)
-    endif()
+    find_package(SQLite3 REQUIRED)
 endif()
 
 if(USE_VENDORED_FLATBUFFERS)
@@ -230,8 +225,8 @@ target_link_libraries(${BTCPP_LIBRARY}
         tinyxml2::tinyxml2
         minicoro::minicoro
         flatbuffers::flatbuffers
-        cpp-sqlite::cpp-sqlite
-        cppzmq
+        $<$<BOOL:${BTCPP_GROOT_INTERFACE}>:cppzmq>
+        $<$<BOOL:${BTCPP_SQLITE_LOGGING}>:SQLite::SQLite3>
     PUBLIC
         ${BTCPP_EXTRA_LIBRARIES}
 )

CMakeLists.txt

@@ -19,15 +19,14 @@ def requirements(self):
         self.requires("flatbuffers/24.12.23")
         self.requires("minicoro/0.1.3")
         self.requires("minitrace/cci.20230905")
-        self.requires("sqlite3/3.40.1") # This should be a transitive dependency of cpp-sqlite
+        self.requires("sqlite3/3.40.1")
         self.requires("tinyxml2/10.0.0")
         self.requires("cppzmq/4.11.0")
         self.requires("foonathan-lexy/2022.12.1")
 
     def generate(self):
         tc = CMakeToolchain(self)
 
-        #tc.cache_variables["USE_VENDORED_CPPSQLITE"] = False
         tc.cache_variables["USE_VENDORED_CPPZMQ"] = False
         tc.cache_variables["USE_VENDORED_FLATBUFFERS"] = False
         tc.cache_variables["USE_VENDORED_LEXY"] = False