Remove bundled SQLite source, add submodule fallback, prefix CMake options with ASQL_ #61

Author: Copilot

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "3rdparty/sqlite"]
+	path = 3rdparty/sqlite
+	url = https://github.com/sqlite/sqlite

3rdparty/sqlite

@@ -34,14 +34,31 @@ endif()
 #
 # Options
 #
-option(ENABLE_MAINTAINER_CFLAGS "Enable maintainer CFlags" OFF)
-option(DRIVER_SQLITE "Enable Sqlite Driver" ON)
-if (DRIVER_SQLITE)
-    enable_language(C)
+option(ASQL_ENABLE_MAINTAINER_CFLAGS "Enable maintainer CFlags" OFF)
+option(ASQL_DRIVER_SQLITE "Enable Sqlite Driver" ON)
+if (ASQL_DRIVER_SQLITE)
+    find_package(SQLite3)
+    if (NOT SQLite3_FOUND)
+        set(ASQL_SQLITE3_SUBMODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sqlite")
+        if (EXISTS "${ASQL_SQLITE3_SUBMODULE_DIR}/sqlite3.c")
+            message(STATUS "SQLite3 not found via find_package, using bundled submodule")
+            enable_language(C)
+            add_library(SQLite3_bundled STATIC "${ASQL_SQLITE3_SUBMODULE_DIR}/sqlite3.c")
+            target_include_directories(SQLite3_bundled PUBLIC "${ASQL_SQLITE3_SUBMODULE_DIR}")
+            add_library(SQLite3::SQLite3 ALIAS SQLite3_bundled)
+        else()
+            message(FATAL_ERROR
+                "SQLite3 not found and 3rdparty/sqlite/sqlite3.c is not available.\n"
+                "Either install the SQLite3 development package or provide the amalgamation:\n"
+                "  1. Initialize the submodule: git submodule update --init 3rdparty/sqlite\n"
+                "  2. Generate the amalgamation (requires tclsh): cd 3rdparty/sqlite && make sqlite3.c\n"
+                "     See https://www.sqlite.org/howtocompile.html for details.")
+        endif()
+    endif()
 endif ()
 
-option(DRIVER_POSTGRES "Enable PostgreSql Driver" ON)
-if (DRIVER_POSTGRES)
+option(ASQL_DRIVER_POSTGRES "Enable PostgreSql Driver" ON)
+if (ASQL_DRIVER_POSTGRES)
     find_package(PostgreSQL REQUIRED)
 endif ()
 
@@ -55,12 +72,13 @@ endif()
 set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Output directory for libraries")
 
 option(BUILD_SHARED_LIBS "Build in shared lib mode" ON)
-option(BUILD_DEMOS "Build the demos" ON)
+option(ASQL_BUILD_DEMOS "Build the demos" ON)
+option(ASQL_MIGRATION_TOOL "Build the migration tool executable" ON)
 
 #
 # Custom C flags
 #
-if (ENABLE_MAINTAINER_CFLAGS)
+if (ASQL_ENABLE_MAINTAINER_CFLAGS)
     set (MAINTAINER_CFLAGS "-Werror -Wall -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Wformat -Winit-self")
     add_definitions(${MAINTAINER_CFLAGS}
         -DQT_DEPRECATED_WARNINGS
@@ -107,7 +125,7 @@ install(EXPORT ASqlTargets
 )
 
 add_subdirectory(src)
-if (BUILD_DEMOS)
+if (ASQL_BUILD_DEMOS)
     add_subdirectory(demos)
 endif ()
 

CMakeLists.txt

@@ -1,10 +1,10 @@
 # SPDX-FileCopyrightText: (C) 2020-2025 Daniel Nicoletti <dantti12@gmail.com>
 # SPDX-License-Identifier: MIT
 
-if (DRIVER_POSTGRES)
+if (ASQL_DRIVER_POSTGRES)
     add_subdirectory(async1)
 endif()
 
-if (DRIVER_SQLITE)
+if (ASQL_DRIVER_SQLITE)
     add_subdirectory(sqlite)
 endif()

demos/CMakeLists.txt

@@ -4,7 +4,7 @@
 #include "adriver.h"
 #include "apreparedquery.h"
 #include "aresult.h"
-#include "sqlite/sqlite3.h"
+#include "sqlite3.h"
 
 #include <chrono>
 #include <optional>

src/ADriverSqlite.hpp

@@ -148,7 +148,7 @@ install(TARGETS ASqlQt${QT_VERSION_MAJOR}Migrations
 # End Migrations Library
 
 ## Postgres Driver
-if (DRIVER_POSTGRES)
+if (ASQL_DRIVER_POSTGRES)
     set(asql_pg_SRC
         adriverpg.cpp
         adriverpg.h
@@ -213,10 +213,8 @@ if (DRIVER_POSTGRES)
 endif() # End Postgres Driver
 
 ## Sqlite Driver
-if (DRIVER_SQLITE)
+if (ASQL_DRIVER_SQLITE)
     set(asql_sqlite_SRC
-        sqlite/sqlite3.c
-        sqlite/sqlite3.h
         ADriverSqlite.cpp
         ADriverSqlite.hpp
         ASqlite.cpp
@@ -261,6 +259,8 @@ if (DRIVER_SQLITE)
         PUBLIC
             Qt::Core
             ASql::Core
+        PRIVATE
+            SQLite3::SQLite3
     )
 
     set_property(TARGET ASqlQt${QT_VERSION_MAJOR}Sqlite PROPERTY PUBLIC_HEADER ${asql_sqlite_HEADERS})
@@ -273,21 +273,23 @@ if (DRIVER_SQLITE)
 
 endif () # End Sqlite Driver
 
-set(TARGET_ASQL_MIGRATION_CMD asql-migration${PROJECT_VERSION_MAJOR}-qt${QT_VERSION_MAJOR})
-add_executable(${TARGET_ASQL_MIGRATION_CMD} asql_migration.cpp)
-target_link_libraries(${TARGET_ASQL_MIGRATION_CMD}
-    PUBLIC
-        Qt::Core
-        ASql::Core
-        ASql::Migrations
-)
-if (DRIVER_POSTGRES)
-    target_link_libraries(${TARGET_ASQL_MIGRATION_CMD} PRIVATE ASql::Pg)
-    target_compile_definitions(${TARGET_ASQL_MIGRATION_CMD} PRIVATE DRIVER_POSTGRES)
-endif()
-if (DRIVER_SQLITE)
-  target_link_libraries(${TARGET_ASQL_MIGRATION_CMD} PRIVATE ASql::Sqlite)
-  target_compile_definitions(${TARGET_ASQL_MIGRATION_CMD} PRIVATE DRIVER_SQLITE)
-endif()
-project_target_compile_definitions(${TARGET_ASQL_MIGRATION_CMD})
-install(TARGETS ${TARGET_ASQL_MIGRATION_CMD} DESTINATION ${CMAKE_INSTALL_BINDIR})
+if (ASQL_MIGRATION_TOOL)
+    set(TARGET_ASQL_MIGRATION_CMD asql-migration${PROJECT_VERSION_MAJOR}-qt${QT_VERSION_MAJOR})
+    add_executable(${TARGET_ASQL_MIGRATION_CMD} asql_migration.cpp)
+    target_link_libraries(${TARGET_ASQL_MIGRATION_CMD}
+        PUBLIC
+            Qt::Core
+            ASql::Core
+            ASql::Migrations
+    )
+    if (ASQL_DRIVER_POSTGRES)
+        target_link_libraries(${TARGET_ASQL_MIGRATION_CMD} PRIVATE ASql::Pg)
+        target_compile_definitions(${TARGET_ASQL_MIGRATION_CMD} PRIVATE DRIVER_POSTGRES)
+    endif()
+    if (ASQL_DRIVER_SQLITE)
+      target_link_libraries(${TARGET_ASQL_MIGRATION_CMD} PRIVATE ASql::Sqlite)
+      target_compile_definitions(${TARGET_ASQL_MIGRATION_CMD} PRIVATE DRIVER_SQLITE)
+    endif()
+    project_target_compile_definitions(${TARGET_ASQL_MIGRATION_CMD})
+    install(TARGETS ${TARGET_ASQL_MIGRATION_CMD} DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif () # End Migration Tool