From 16dc653918d1dde172fb3fd7cf2e07e738f87d1d Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 25 Sep 2015 20:35:35 +0100
Subject: Install rules and use system dbpp

---
 libsqlitepp/Jamfile.jam              | 17 +++++++++++++++--
 libsqlitepp/command.h                |  2 +-
 libsqlitepp/connection.h             |  2 +-
 libsqlitepp/error.h                  |  2 +-
 libsqlitepp/modifycommand.h          |  2 +-
 libsqlitepp/selectcommand.h          |  2 +-
 libsqlitepp/unittests/Jamfile.jam    |  7 ++++++-
 libsqlitepp/unittests/testsqlite.cpp |  6 +++---
 8 files changed, 29 insertions(+), 11 deletions(-)

(limited to 'libsqlitepp')

diff --git a/libsqlitepp/Jamfile.jam b/libsqlitepp/Jamfile.jam
index 71605a3..a3ccbf0 100644
--- a/libsqlitepp/Jamfile.jam
+++ b/libsqlitepp/Jamfile.jam
@@ -1,22 +1,35 @@
+import package ;
 alias glibmm : : : :
 	<cflags>"`pkg-config --cflags glibmm-2.4`"
 	<linkflags>"`pkg-config --libs glibmm-2.4`"
 	;
 
 lib libsqlite : : <name>sqlite3 ;
+lib adhocutil : : : : <include>/usr/include/adhocutil ;
+lib dbppcore : : : : <include>/usr/include/dbpp ;
+lib boost_date_time ;
+lib boost_filesystem ;
+lib boost_system ;
 
 lib dbpp-sqlite :
 	[ glob *.cpp ] :
 	<library>glibmm
 	<library>libsqlite
-	<library>../libdbpp
+	<library>adhocutil
+	<library>dbppcore
+	<library>boost_date_time
+	<library>boost_system
+	<library>boost_filesystem
+	<cflags>-fvisibility=hidden
 	<cflags>-fvisibility=hidden
 	<variant>release:<cflags>-flto
 	: :
 	<include>.
 	<library>glibmm
-	<library>../libdbpp
+	<library>dbppcore
 	;
 
 build-project unittests ;
 
+package.install install : <install-source-root>. : : dbpp-sqlite : [ glob *.h ] ;
+
diff --git a/libsqlitepp/command.h b/libsqlitepp/command.h
index f1d12e9..c66d71d 100644
--- a/libsqlitepp/command.h
+++ b/libsqlitepp/command.h
@@ -1,7 +1,7 @@
 #ifndef SQLITE_COMMAND_H
 #define SQLITE_COMMAND_H
 
-#include "../libdbpp/command.h"
+#include <command.h>
 #include <sqlite3.h>
 
 namespace SQLite {
diff --git a/libsqlitepp/connection.h b/libsqlitepp/connection.h
index aa73036..6fd6aa3 100644
--- a/libsqlitepp/connection.h
+++ b/libsqlitepp/connection.h
@@ -1,7 +1,7 @@
 #ifndef SQLITE_CONNECTION_H
 #define SQLITE_CONNECTION_H
 
-#include "../libdbpp/connection.h"
+#include <connection.h>
 #include "error.h"
 #include <sqlite3.h>
 
diff --git a/libsqlitepp/error.h b/libsqlitepp/error.h
index a7f0ae1..3f8d32e 100644
--- a/libsqlitepp/error.h
+++ b/libsqlitepp/error.h
@@ -1,7 +1,7 @@
 #ifndef SQLITE_ERROR_H
 #define SQLITE_ERROR_H
 
-#include "../libdbpp/error.h"
+#include <error.h>
 
 namespace SQLite {
 	class Error : public DB::Error {
diff --git a/libsqlitepp/modifycommand.h b/libsqlitepp/modifycommand.h
index ffb1205..7f052ca 100644
--- a/libsqlitepp/modifycommand.h
+++ b/libsqlitepp/modifycommand.h
@@ -1,7 +1,7 @@
 #ifndef SQLITE_MODIFYCOMMAND_H
 #define SQLITE_MODIFYCOMMAND_H
 
-#include "../libdbpp/modifycommand.h"
+#include <modifycommand.h>
 #include "command.h"
 
 namespace SQLite {
diff --git a/libsqlitepp/selectcommand.h b/libsqlitepp/selectcommand.h
index be8b02b..c3ad01d 100644
--- a/libsqlitepp/selectcommand.h
+++ b/libsqlitepp/selectcommand.h
@@ -1,7 +1,7 @@
 #ifndef SQLITE_SELECTCOMMAND_H
 #define SQLITE_SELECTCOMMAND_H
 
-#include "../libdbpp/selectcommand.h"
+#include <selectcommand.h>
 #include "command.h"
 
 namespace SQLite {
diff --git a/libsqlitepp/unittests/Jamfile.jam b/libsqlitepp/unittests/Jamfile.jam
index a826f24..91afcae 100644
--- a/libsqlitepp/unittests/Jamfile.jam
+++ b/libsqlitepp/unittests/Jamfile.jam
@@ -3,6 +3,9 @@ import testing ;
 path-constant me : . ;
 
 lib boost_utf : : <name>boost_unit_test_framework ;
+lib boost_filesystem ;
+lib boost_system ;
+lib dbpptestcore : : : : <include>/usr/include/dbpp ;
 
 run
 	testsqlite.cpp
@@ -10,8 +13,10 @@ run
 	<define>ROOT=\"$(me)\"
 	<define>BOOST_TEST_DYN_LINK
 	<library>..//dbpp-sqlite
-	<library>../../libdbpp//dbpptestcore
+	<library>dbpptestcore
 	<library>boost_utf
+	<library>boost_filesystem
+	<library>boost_system
 	:
 	testsqlite
 	;
diff --git a/libsqlitepp/unittests/testsqlite.cpp b/libsqlitepp/unittests/testsqlite.cpp
index a4b7880..6f88075 100644
--- a/libsqlitepp/unittests/testsqlite.cpp
+++ b/libsqlitepp/unittests/testsqlite.cpp
@@ -2,9 +2,9 @@
 #include <boost/test/unit_test.hpp>
 
 #include <definedDirs.h>
-#include <modifycommand.h>
-#include <selectcommand.h>
-#include <column.h>
+#include <dbpp/modifycommand.h>
+#include <dbpp/selectcommand.h>
+#include <dbpp/column.h>
 #include <mock.h>
 #include "testCore.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
-- 
cgit v1.2.3