Grouped components

bgs99 · Jul 7, 2024 · 8a45fdf · 8a45fdf
1 parent 1dd2b38
commit 8a45fdf
Show file tree

Hide file tree

Showing 36 changed files with 16 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,8 +4,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 project(podrm LANGUAGES C CXX)
 
-add_subdirectory(components)
-
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
   option(PFR_ORM_ASAN "Build podrm with address sanitizer" OFF)
 
@@ -16,3 +14,5 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
 
   include(CTest)
 endif()
+
+add_subdirectory(components)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
@@ -1,5 +1,4 @@
-add_subdirectory(span)
-add_subdirectory(reflection)
 add_subdirectory(metadata)
-add_subdirectory(sqlite)
-add_subdirectory(postgres)
+add_subdirectory(reflection)
+add_subdirectory(databases)
+add_subdirectory(utils)
diff --git a/components/databases/CMakeLists.txt b/components/databases/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(postgres)
+add_subdirectory(sqlite)
diff --git a/components/postgres/CMakeLists.txt → components/databases/postgres/CMakeLists.txt b/components/postgres/CMakeLists.txt → components/databases/postgres/CMakeLists.txt
@@ -7,5 +7,5 @@ target_sources(podrm-postgres PRIVATE lib/connection.cpp lib/result.cpp
 target_link_libraries(
   podrm-postgres
   PUBLIC podrm-metadata
-  PRIVATE PostgreSQL::PostgreSQL fmt::fmt)
+  PRIVATE podrm-multilambda PostgreSQL::PostgreSQL fmt::fmt)
 target_include_directories(podrm-postgres PUBLIC include)
diff --git a/...tgres/include/podrm/postgres/database.hpp → ...tgres/include/podrm/postgres/database.hpp b/...tgres/include/podrm/postgres/database.hpp → ...tgres/include/podrm/postgres/database.hpp
diff --git a/...lude/podrm/postgres/detail/connection.hpp → ...lude/podrm/postgres/detail/connection.hpp b/...lude/podrm/postgres/detail/connection.hpp → ...lude/podrm/postgres/detail/connection.hpp
diff --git a/.../include/podrm/postgres/detail/result.hpp → .../include/podrm/postgres/detail/result.hpp b/.../include/podrm/postgres/detail/result.hpp → .../include/podrm/postgres/detail/result.hpp
diff --git a/...res/include/podrm/postgres/detail/str.hpp → ...res/include/podrm/postgres/detail/str.hpp b/...res/include/podrm/postgres/detail/str.hpp → ...res/include/podrm/postgres/detail/str.hpp
diff --git a/components/postgres/lib/connection.cpp → ...nts/databases/postgres/lib/connection.cpp b/components/postgres/lib/connection.cpp → ...nts/databases/postgres/lib/connection.cpp
@@ -1,7 +1,7 @@
-#include "detail/multilambda.hpp"
 #include "formatters.hpp" // IWYU pragma: keep
 
 #include <podrm/metadata.hpp>
+#include <podrm/multilambda.hpp>
 #include <podrm/postgres/detail/connection.hpp>
 #include <podrm/postgres/detail/result.hpp>
 #include <podrm/postgres/detail/str.hpp>

diff --git a/components/postgres/lib/formatters.hpp → ...nts/databases/postgres/lib/formatters.hpp b/components/postgres/lib/formatters.hpp → ...nts/databases/postgres/lib/formatters.hpp
diff --git a/components/postgres/lib/result.cpp → components/databases/postgres/lib/result.cpp b/components/postgres/lib/result.cpp → components/databases/postgres/lib/result.cpp
diff --git a/components/postgres/lib/str.cpp → components/databases/postgres/lib/str.cpp b/components/postgres/lib/str.cpp → components/databases/postgres/lib/str.cpp
diff --git a/components/sqlite/CMakeLists.txt → components/databases/sqlite/CMakeLists.txt b/components/sqlite/CMakeLists.txt → components/databases/sqlite/CMakeLists.txt
@@ -7,7 +7,7 @@ target_sources(podrm-sqlite PRIVATE lib/connection.cpp lib/cursor.cpp
 target_link_libraries(
   podrm-sqlite
   PUBLIC podrm-metadata
-  PRIVATE SQLite::SQLite3 fmt::fmt)
+  PRIVATE podrm-multilambda SQLite::SQLite3 fmt::fmt)
 target_include_directories(podrm-sqlite PUBLIC include)
 
 if(BUILD_TESTING)

diff --git a/components/sqlite/include/podrm/sqlite.hpp → ...databases/sqlite/include/podrm/sqlite.hpp b/components/sqlite/include/podrm/sqlite.hpp → ...databases/sqlite/include/podrm/sqlite.hpp
diff --git a/...ts/sqlite/include/podrm/sqlite/cursor.hpp → ...es/sqlite/include/podrm/sqlite/cursor.hpp b/...ts/sqlite/include/podrm/sqlite/cursor.hpp → ...es/sqlite/include/podrm/sqlite/cursor.hpp
diff --git a/.../sqlite/include/podrm/sqlite/database.hpp → .../sqlite/include/podrm/sqlite/database.hpp b/.../sqlite/include/podrm/sqlite/database.hpp → .../sqlite/include/podrm/sqlite/database.hpp
diff --git a/...nclude/podrm/sqlite/detail/connection.hpp → ...nclude/podrm/sqlite/detail/connection.hpp b/...nclude/podrm/sqlite/detail/connection.hpp → ...nclude/podrm/sqlite/detail/connection.hpp
diff --git a/...te/include/podrm/sqlite/detail/cursor.hpp → ...te/include/podrm/sqlite/detail/cursor.hpp b/...te/include/podrm/sqlite/detail/cursor.hpp → ...te/include/podrm/sqlite/detail/cursor.hpp
diff --git a/...ite/include/podrm/sqlite/detail/entry.hpp → ...ite/include/podrm/sqlite/detail/entry.hpp b/...ite/include/podrm/sqlite/detail/entry.hpp → ...ite/include/podrm/sqlite/detail/entry.hpp
diff --git a/...te/include/podrm/sqlite/detail/result.hpp → ...te/include/podrm/sqlite/detail/result.hpp b/...te/include/podrm/sqlite/detail/result.hpp → ...te/include/podrm/sqlite/detail/result.hpp
diff --git a/...qlite/include/podrm/sqlite/detail/row.hpp → ...qlite/include/podrm/sqlite/detail/row.hpp b/...qlite/include/podrm/sqlite/detail/row.hpp → ...qlite/include/podrm/sqlite/detail/row.hpp
diff --git a/components/sqlite/lib/connection.cpp → ...nents/databases/sqlite/lib/connection.cpp b/components/sqlite/lib/connection.cpp → ...nents/databases/sqlite/lib/connection.cpp
@@ -1,6 +1,5 @@
-#include "detail/multilambda.hpp"
-
 #include <podrm/metadata.hpp>
+#include <podrm/multilambda.hpp>
 #include <podrm/span.hpp>
 #include <podrm/sqlite/detail/connection.hpp>
 #include <podrm/sqlite/detail/cursor.hpp>

diff --git a/components/sqlite/lib/cursor.cpp → components/databases/sqlite/lib/cursor.cpp b/components/sqlite/lib/cursor.cpp → components/databases/sqlite/lib/cursor.cpp
@@ -1,6 +1,5 @@
-#include "detail/multilambda.hpp"
-
 #include <podrm/metadata.hpp>
+#include <podrm/multilambda.hpp>
 #include <podrm/span.hpp>
 #include <podrm/sqlite/detail/cursor.hpp>
 #include <podrm/sqlite/detail/result.hpp>

diff --git a/components/sqlite/lib/entry.cpp → components/databases/sqlite/lib/entry.cpp b/components/sqlite/lib/entry.cpp → components/databases/sqlite/lib/entry.cpp
diff --git a/components/sqlite/lib/result.cpp → components/databases/sqlite/lib/result.cpp b/components/sqlite/lib/result.cpp → components/databases/sqlite/lib/result.cpp
diff --git a/components/sqlite/lib/row.cpp → components/databases/sqlite/lib/row.cpp b/components/sqlite/lib/row.cpp → components/databases/sqlite/lib/row.cpp
diff --git a/components/sqlite/test/.clang-tidy → components/databases/sqlite/test/.clang-tidy b/components/sqlite/test/.clang-tidy → components/databases/sqlite/test/.clang-tidy
diff --git a/components/sqlite/test/CMakeLists.txt → ...ents/databases/sqlite/test/CMakeLists.txt b/components/sqlite/test/CMakeLists.txt → ...ents/databases/sqlite/test/CMakeLists.txt
diff --git a/components/sqlite/test/field.hpp → components/databases/sqlite/test/field.hpp b/components/sqlite/test/field.hpp → components/databases/sqlite/test/field.hpp
diff --git a/components/sqlite/test/test.cpp → components/databases/sqlite/test/test.cpp b/components/sqlite/test/test.cpp → components/databases/sqlite/test/test.cpp
diff --git a/components/sqlite/lib/detail/multilambda.hpp b/components/sqlite/lib/detail/multilambda.hpp
diff --git a/components/utils/CMakeLists.txt b/components/utils/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(span)
+add_subdirectory(multilambda)
diff --git a/components/utils/multilambda/CMakeLists.txt b/components/utils/multilambda/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_library(podrm-multilambda INTERFACE)
+target_include_directories(podrm-multilambda INTERFACE SYSTEM include)
diff --git a/...nents/postgres/lib/detail/multilambda.hpp → ...multilambda/include/podrm/multilambda.hpp b/...nents/postgres/lib/detail/multilambda.hpp → ...multilambda/include/podrm/multilambda.hpp
diff --git a/components/span/CMakeLists.txt → components/utils/span/CMakeLists.txt b/components/span/CMakeLists.txt → components/utils/span/CMakeLists.txt
diff --git a/components/span/include/podrm/span.hpp → components/utils/span/include/podrm/span.hpp b/components/span/include/podrm/span.hpp → components/utils/span/include/podrm/span.hpp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		add_subdirectory(postgres)
		add_subdirectory(sqlite)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		add_subdirectory(span)
		add_subdirectory(multilambda)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		add_library(podrm-multilambda INTERFACE)
		target_include_directories(podrm-multilambda INTERFACE SYSTEM include)