diff options
Diffstat (limited to 'slicer/db')
| -rw-r--r-- | slicer/db/Jamfile.jam | 5 | ||||
| -rw-r--r-- | slicer/db/sqlCommon.cpp | 2 | ||||
| -rw-r--r-- | slicer/db/sqlExceptions.ice | 2 | ||||
| -rw-r--r-- | slicer/db/sqlInsertSerializer.h | 2 | ||||
| -rw-r--r-- | slicer/db/sqlSelectDeserializer.h | 4 | ||||
| -rw-r--r-- | slicer/db/sqlTablePatchSerializer.h | 2 | ||||
| -rw-r--r-- | slicer/db/sqlUpdateSerializer.h | 2 | ||||
| -rw-r--r-- | slicer/db/testInsert.cpp | 2 |
8 files changed, 10 insertions, 11 deletions
diff --git a/slicer/db/Jamfile.jam b/slicer/db/Jamfile.jam index bc43dcb..2e5c69f 100644 --- a/slicer/db/Jamfile.jam +++ b/slicer/db/Jamfile.jam @@ -10,7 +10,6 @@ lib slicer-db : [ glob *.cpp : test*.cpp ] sqlExceptions : - <include>.. <library>..//Ice <library>dbppcore <library>../..//glibmm @@ -141,6 +140,6 @@ alias install : install-lib install-slice ; explicit install ; explicit install-lib ; explicit install-slice ; -package.install install-lib : <install-header-subdir>slicer/db : : slicer-db : [ glob-tree *.h ] ; -package.install-data install-slice : slicer/ice : [ glob *.ice ] ; +package.install install-lib : <install-header-subdir>slicer/db : : slicer-db : [ glob-tree *.h : test*.h ] ; +package.install-data install-slice : slicer/ice : [ glob *.ice : test*.ice ] ; diff --git a/slicer/db/sqlCommon.cpp b/slicer/db/sqlCommon.cpp index f60d33f..40e43f7 100644 --- a/slicer/db/sqlCommon.cpp +++ b/slicer/db/sqlCommon.cpp @@ -1,6 +1,6 @@ #include "sqlCommon.h" #include <compileTimeFormatter.h> -#include <modelParts.h> +#include <slicer/modelParts.h> #include <sqlExceptions.h> #include <string_view> diff --git a/slicer/db/sqlExceptions.ice b/slicer/db/sqlExceptions.ice index 3aca6a2..d56c956 100644 --- a/slicer/db/sqlExceptions.ice +++ b/slicer/db/sqlExceptions.ice @@ -1,7 +1,7 @@ #ifndef SLICER_XML #define SLICER_XML -#include <common.ice> +#include <slicer/common.ice> module Slicer { ["cpp:ice_print"] diff --git a/slicer/db/sqlInsertSerializer.h b/slicer/db/sqlInsertSerializer.h index 6bcfae3..26989fc 100644 --- a/slicer/db/sqlInsertSerializer.h +++ b/slicer/db/sqlInsertSerializer.h @@ -1,9 +1,9 @@ #ifndef SLICER_DB_SQLINSERTSERIALIZER_H #define SLICER_DB_SQLINSERTSERIALIZER_H -#include "modelParts.h" #include <command_fwd.h> #include <ostream> +#include <slicer/modelParts.h> #include <slicer/serializer.h> #include <string> #include <visibility.h> diff --git a/slicer/db/sqlSelectDeserializer.h b/slicer/db/sqlSelectDeserializer.h index b681817..bf2b351 100644 --- a/slicer/db/sqlSelectDeserializer.h +++ b/slicer/db/sqlSelectDeserializer.h @@ -1,9 +1,9 @@ #ifndef SLICER_DB_SQLSELECTDESERIALIZER_H #define SLICER_DB_SQLSELECTDESERIALIZER_H -#include "modelParts.h" -#include "slicer/serializer.h" #include <optional> +#include <slicer/modelParts.h> +#include <slicer/serializer.h> #include <string> #include <visibility.h> namespace DB { diff --git a/slicer/db/sqlTablePatchSerializer.h b/slicer/db/sqlTablePatchSerializer.h index 8973072..21c8b3d 100644 --- a/slicer/db/sqlTablePatchSerializer.h +++ b/slicer/db/sqlTablePatchSerializer.h @@ -1,7 +1,7 @@ #ifndef SLICER_DB_SQLTABLEPATCHSERIALIZER_H #define SLICER_DB_SQLTABLEPATCHSERIALIZER_H -#include "modelParts.h" +#include <slicer/modelParts.h> #include <slicer/serializer.h> #include <visibility.h> namespace DB { diff --git a/slicer/db/sqlUpdateSerializer.h b/slicer/db/sqlUpdateSerializer.h index 4204b86..8707988 100644 --- a/slicer/db/sqlUpdateSerializer.h +++ b/slicer/db/sqlUpdateSerializer.h @@ -1,8 +1,8 @@ #ifndef SLICER_DB_SQLUPDATESERIALIZER_H #define SLICER_DB_SQLUPDATESERIALIZER_H -#include "modelParts.h" #include <command_fwd.h> +#include <slicer/modelParts.h> #include <slicer/serializer.h> #include <string> #include <visibility.h> diff --git a/slicer/db/testInsert.cpp b/slicer/db/testInsert.cpp index 37196b1..a9e42f1 100644 --- a/slicer/db/testInsert.cpp +++ b/slicer/db/testInsert.cpp @@ -4,7 +4,6 @@ #include "classes.h" #include "collections.h" #include "common.h" -#include "slicer/slicer.h" #include "sqlInsertSerializer.h" #include "sqlSelectDeserializer.h" #include "structs.h" @@ -14,6 +13,7 @@ #include <connection.h> #include <iosfwd> #include <memory> +#include <slicer/slicer.h> #include <string> #include <string_view> #include <vector> |