Fix not all headers getting installed

SOCI · Sep 1, 2024 · 6b6db13 · 6b6db13
1 parent a74341c
commit 6b6db13
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 4 deletions.
diff --git a/src/backends/db2/CMakeLists.txt b/src/backends/db2/CMakeLists.txt
@@ -34,6 +34,14 @@ set_target_properties(
   EXPORT_NAME DB2
 )
 
+target_sources(soci_db2
+  PUBLIC
+    FILE_SET headers TYPE HEADERS
+    BASE_DIRS "${PROJECT_SOURCE_DIR}/include"
+    FILES
+      "${PROJECT_SOURCE_DIR}/include/soci/db2/soci-db2.h"
+)
+
 soci_public_dependency(
   NAME DB2
   DEP_TARGETS DB2::DB2

diff --git a/src/backends/empty/CMakeLists.txt b/src/backends/empty/CMakeLists.txt
@@ -20,6 +20,15 @@ set_target_properties(
   VERSION ${PROJECT_VERSION}
   EXPORT_NAME Empty
 )
+
+target_sources(soci_empty
+  PUBLIC
+    FILE_SET headers TYPE HEADERS
+    BASE_DIRS "${PROJECT_SOURCE_DIR}/include"
+    FILES
+      "${PROJECT_SOURCE_DIR}/include/soci/empty/soci-empty.h"
+)
+
 soci_public_dependency(
   NAME SOCI::Core
   DEP_TARGETS SOCI::Core

diff --git a/src/backends/firebird/CMakeLists.txt b/src/backends/firebird/CMakeLists.txt
@@ -41,6 +41,14 @@ set_target_properties(
   EXPORT_NAME Firebird
 )
 
+target_sources(soci_firebird
+  PUBLIC
+    FILE_SET headers TYPE HEADERS
+    BASE_DIRS "${PROJECT_SOURCE_DIR}/include"
+    FILES
+      "${PROJECT_SOURCE_DIR}/include/soci/firebird/soci-firebird.h"
+)
+
 soci_public_dependency(
   NAME Firebird
   DEP_TARGETS Firebird::Firebird

diff --git a/src/backends/mysql/CMakeLists.txt b/src/backends/mysql/CMakeLists.txt
@@ -35,6 +35,14 @@ set_target_properties(
   EXPORT_NAME MySQL
 )
 
+target_sources(soci_mysql
+  PUBLIC
+    FILE_SET headers TYPE HEADERS
+    BASE_DIRS "${PROJECT_SOURCE_DIR}/include"
+    FILES
+      "${PROJECT_SOURCE_DIR}/include/soci/mysql/soci-mysql.h"
+)
+
 soci_public_dependency(
   NAME MySQL
   DEP_TARGETS MySQL::MySQL

diff --git a/src/backends/odbc/CMakeLists.txt b/src/backends/odbc/CMakeLists.txt
@@ -34,6 +34,14 @@ set_target_properties(
   EXPORT_NAME ODBC
 )
 
+target_sources(soci_odbc
+  PUBLIC
+    FILE_SET headers TYPE HEADERS
+    BASE_DIRS "${PROJECT_SOURCE_DIR}/include"
+    FILES
+      "${PROJECT_SOURCE_DIR}/include/soci/odbc/soci-odbc.h"
+)
+
 soci_public_dependency(
   NAME ODBC
   DEP_TARGETS ODBC::ODBC

diff --git a/src/backends/oracle/CMakeLists.txt b/src/backends/oracle/CMakeLists.txt
@@ -35,6 +35,14 @@ set_target_properties(
   EXPORT_NAME Oracle
 )
 
+target_sources(soci_oracle
+  PUBLIC
+    FILE_SET headers TYPE HEADERS
+    BASE_DIRS "${PROJECT_SOURCE_DIR}/include"
+    FILES
+      "${PROJECT_SOURCE_DIR}/include/soci/oracle/soci-oracle.h"
+)
+
 soci_public_dependency(
   NAME Oracle
   DEP_TARGETS Oracle::Oracle

diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
@@ -43,6 +43,14 @@ set_target_properties(
   EXPORT_NAME PostgreSQL
 )
 
+target_sources(soci_postgresql
+  PUBLIC
+    FILE_SET headers TYPE HEADERS
+    BASE_DIRS "${PROJECT_SOURCE_DIR}/include"
+    FILES
+      "${PROJECT_SOURCE_DIR}/include/soci/postgresql/soci-postgresql.h"
+)
+
 soci_public_dependency(
   NAME PostgreSQL
   DEP_TARGETS PostgreSQL::PostgreSQL

diff --git a/src/backends/sqlite3/CMakeLists.txt b/src/backends/sqlite3/CMakeLists.txt
@@ -35,6 +35,14 @@ set_target_properties(
   EXPORT_NAME SQLite3
 )
 
+target_sources(soci_sqlite3
+  PUBLIC
+    FILE_SET headers TYPE HEADERS
+    BASE_DIRS "${PROJECT_SOURCE_DIR}/include"
+    FILES
+      "${PROJECT_SOURCE_DIR}/include/soci/sqlite3/soci-sqlite3.h"
+)
+
 soci_public_dependency(
   NAME SQLite3
   DEP_TARGETS SQLite::SQLite3

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -60,8 +60,9 @@ target_sources(soci_core
       "${PROJECT_SOURCE_DIR}/include/soci/error.h"
       "${PROJECT_SOURCE_DIR}/include/soci/exchange-traits.h"
       "${PROJECT_SOURCE_DIR}/include/soci/fixed-size-ints.h"
-      "${PROJECT_SOURCE_DIR}/include/soci/into.h"
       "${PROJECT_SOURCE_DIR}/include/soci/into-type.h"
+      "${PROJECT_SOURCE_DIR}/include/soci/into.h"
+      "${PROJECT_SOURCE_DIR}/include/soci/is-detected.h"
       "${PROJECT_SOURCE_DIR}/include/soci/logger.h"
       "${PROJECT_SOURCE_DIR}/include/soci/noreturn.h"
       "${PROJECT_SOURCE_DIR}/include/soci/once-temp-type.h"
@@ -77,20 +78,20 @@ target_sources(soci_core
       "${PROJECT_SOURCE_DIR}/include/soci/rowset.h"
       "${PROJECT_SOURCE_DIR}/include/soci/session.h"
       "${PROJECT_SOURCE_DIR}/include/soci/soci-backend.h"
-      "${PROJECT_SOURCE_DIR}/include/soci/soci.h"
       "${PROJECT_SOURCE_DIR}/include/soci/soci-platform.h"
       "${PROJECT_SOURCE_DIR}/include/soci/soci-simple.h"
       "${PROJECT_SOURCE_DIR}/include/soci/soci-types.h"
+      "${PROJECT_SOURCE_DIR}/include/soci/soci.h"
       "${PROJECT_SOURCE_DIR}/include/soci/statement.h"
       "${PROJECT_SOURCE_DIR}/include/soci/std-optional.h"
       "${PROJECT_SOURCE_DIR}/include/soci/transaction.h"
-      "${PROJECT_SOURCE_DIR}/include/soci/type-conversion.h"
       "${PROJECT_SOURCE_DIR}/include/soci/type-conversion-traits.h"
+      "${PROJECT_SOURCE_DIR}/include/soci/type-conversion.h"
       "${PROJECT_SOURCE_DIR}/include/soci/type-holder.h"
       "${PROJECT_SOURCE_DIR}/include/soci/type-ptr.h"
       "${PROJECT_SOURCE_DIR}/include/soci/type-wrappers.h"
-      "${PROJECT_SOURCE_DIR}/include/soci/use.h"
       "${PROJECT_SOURCE_DIR}/include/soci/use-type.h"
+      "${PROJECT_SOURCE_DIR}/include/soci/use.h"
       "${PROJECT_SOURCE_DIR}/include/soci/values-exchange.h"
       "${PROJECT_SOURCE_DIR}/include/soci/values.h"
       "${PROJECT_SOURCE_DIR}/include/soci/version.h"