use swift-lmdb as a dependency

swiftlang · Nov 12, 2024 · 8464623 · 8464623
1 parent 54212fc
commit 8464623
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 13,729 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,6 +13,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE YES)
 
 find_package(dispatch CONFIG)
 find_package(Foundation CONFIG)
+find_package(LMDB CONFIG)
 
 include(SwiftSupport)
 

diff --git a/Package.swift b/Package.swift
@@ -18,7 +18,9 @@ let package = Package(
       name: "tibs",
       targets: ["tibs"])
   ],
-  dependencies: [],
+  dependencies: [
+    .package(url: "https://github.com/swiftlang/swift-lmdb.git", branch: "main"),
+  ],
   targets: [
 
     // MARK: Swift interface
@@ -81,12 +83,13 @@ let package = Package(
     // The lmdb database layer.
     .target(
       name: "IndexStoreDB_Database",
-      dependencies: ["IndexStoreDB_Core"],
+      dependencies: [
+        "IndexStoreDB_Core",
+        .product(name: "CLMDB", package: "swift-lmdb"),
+      ],
       path: "lib/Database",
       exclude: [
         "CMakeLists.txt",
-        "lmdb/LICENSE",
-        "lmdb/COPYRIGHT",
       ],
       cSettings: [
         .define("MDB_USE_POSIX_MUTEX", to: "1",

diff --git a/lib/Database/CMakeLists.txt b/lib/Database/CMakeLists.txt
@@ -2,9 +2,7 @@ add_library(Database STATIC
   Database.cpp
   DatabaseError.cpp
   ImportTransaction.cpp
-  ReadTransaction.cpp
-  lmdb/mdb.c
-  lmdb/midl.c)
+  ReadTransaction.cpp)
 target_compile_definitions(Database PRIVATE
   _CRT_NONSTDC_NO_WARNINGS
   _CRT_SECURE_NO_WARNINGS)
@@ -13,6 +11,7 @@ target_compile_options(Database PRIVATE
 target_include_directories(Database PRIVATE
   include)
 target_link_libraries(Database PRIVATE
+  LMDB::CLMDB
   Core
   LLVMSupport)
 if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

diff --git a/lib/Database/lmdb/COPYRIGHT b/lib/Database/lmdb/COPYRIGHT
diff --git a/lib/Database/lmdb/LICENSE b/lib/Database/lmdb/LICENSE