sqlite3 library amalgamation

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
eProsima · Dec 30, 2024 · 7b12ed7 · 7b12ed7
1 parent 4d292a4
commit 7b12ed7
Show file tree

Hide file tree

Showing 11 changed files with 274,088 additions and 8 deletions.
diff --git a/ddsrecorder/project_settings.cmake b/ddsrecorder/project_settings.cmake
@@ -58,6 +58,7 @@ set(MODULE_THIRDPARTY_HEADERONLY
     mcap
     nlohmann-json
     optionparser
+    sqlite
     )
 
 set(MODULE_THIRDPARTY_PATH

diff --git a/ddsrecorder/test/blackbox/sql/SqlFileCreationTest.cpp b/ddsrecorder/test/blackbox/sql/SqlFileCreationTest.cpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include <sqlite3.h>
+#include <sqlite/sqlite3.h>
 
 #include <gtest/gtest.h>
 

diff --git a/ddsrecorder_participants/CMakeLists.txt b/ddsrecorder_participants/CMakeLists.txt
@@ -18,6 +18,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 # Done this to set machine architecture and be able to call cmake_utils
+enable_language(C)
 enable_language(CXX)
 
 ###############################################################################
@@ -63,6 +64,7 @@ configure_project_cpp()
 file(
     GLOB_RECURSE SOURCES_FILES
         "${PROJECT_SOURCE_DIR}/src/cpp/*.c*"
+        "${PROJECT_SOURCE_DIR}/../thirdparty/sqlite/*.c"
     )
 
 file(

diff --git a/ddsrecorder_participants/include/ddsrecorder_participants/recorder/sql/SqlWriter.hpp b/ddsrecorder_participants/include/ddsrecorder_participants/recorder/sql/SqlWriter.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <sqlite3.h>
+#include <sqlite/sqlite3.h>
 #include <string>
 #include <vector>
 

diff --git a/ddsrecorder_participants/include/ddsrecorder_participants/replayer/SqlReaderParticipant.hpp b/ddsrecorder_participants/include/ddsrecorder_participants/replayer/SqlReaderParticipant.hpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <utility>
 
-#include <sqlite3.h>
+#include <sqlite/sqlite3.h>
 
 #include <cpp_utils/memory/Heritable.hpp>
 

diff --git a/ddsrecorder_participants/project_settings.cmake b/ddsrecorder_participants/project_settings.cmake
@@ -39,7 +39,8 @@ endif()
 
 set(MODULE_THIRDPARTY_HEADERONLY
     mcap
-    nlohmann-json)
+    nlohmann-json
+    sqlite)
 
 set(fastdds_MINIMUM_VERSION "3.0.0")
 
@@ -52,8 +53,7 @@ set(MODULE_DEPENDENCIES
     ddspipe_core
     ddspipe_participants
     $<IF:$<BOOL:${WIN32}>,lz4::lz4,lz4>
-    $<IF:$<BOOL:${WIN32}>,$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>,zstd>
-    sqlite3)
+    $<IF:$<BOOL:${WIN32}>,$<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>,zstd>)
 
 set(MODULE_CPP_VERSION
     C++17)
diff --git a/ddsrecorder_participants/src/cpp/recorder/sql/SqlWriter.cpp b/ddsrecorder_participants/src/cpp/recorder/sql/SqlWriter.cpp
@@ -20,7 +20,7 @@
 #include <stdexcept>
 #include <vector>
 
-#include <sqlite3.h>
+#include <sqlite/sqlite3.h>
 
 #include <cpp_utils/exception/InconsistencyException.hpp>
 #include <cpp_utils/exception/InitializationException.hpp>

diff --git a/ddsrecorder_participants/src/cpp/replayer/SqlReaderParticipant.cpp b/ddsrecorder_participants/src/cpp/replayer/SqlReaderParticipant.cpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <utility>
 
-#include <sqlite3.h>
+#include <sqlite/sqlite3.h>
 
 #include <fastdds/dds/core/Time_t.hpp>
 

diff --git a/ddsreplayer/project_settings.cmake b/ddsreplayer/project_settings.cmake
@@ -56,6 +56,7 @@ set(MODULE_DEPENDENCIES
 set(MODULE_THIRDPARTY_HEADERONLY
     filewatch
     mcap
+    sqlite
     optionparser
     )
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,7 @@ set(MODULE_THIRDPARTY_HEADERONLY @@
         mcap
         nlohmann-json
         optionparser
+        sqlite
         )
     set(MODULE_THIRDPARTY_PATH
@@ Expand Down @@