From e5bc15f20deb8cba1e79b324a3056ec9e7ecefdc Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 25 Sep 2015 20:05:18 +0100
Subject: Use system dbpp

---
 libpqpp/column.h              | 2 +-
 libpqpp/command.h             | 2 +-
 libpqpp/connection.h          | 2 +-
 libpqpp/error.h               | 2 +-
 libpqpp/modifycommand.h       | 2 +-
 libpqpp/selectcommand.h       | 2 +-
 libpqpp/unittests/Jamfile.jam | 7 ++++++-
 libpqpp/unittests/testpq.cpp  | 6 +++---
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/libpqpp/column.h b/libpqpp/column.h
index 22ab755..5980763 100644
--- a/libpqpp/column.h
+++ b/libpqpp/column.h
@@ -1,7 +1,7 @@
 #ifndef PG_COLUMN_H
 #define PG_COLUMN_H
 
-#include "../libdbpp/column.h"
+#include <column.h>
 #include <libpq-fe.h>
 
 namespace PQ {
diff --git a/libpqpp/command.h b/libpqpp/command.h
index a3601c4..e6edac2 100644
--- a/libpqpp/command.h
+++ b/libpqpp/command.h
@@ -1,7 +1,7 @@
 #ifndef PQ_COMMAND_H
 #define PQ_COMMAND_H
 
-#include "../libdbpp/command.h"
+#include <command.h>
 #include <libpq-fe.h>
 #include <vector>
 
diff --git a/libpqpp/connection.h b/libpqpp/connection.h
index a2cabce..bb291b1 100644
--- a/libpqpp/connection.h
+++ b/libpqpp/connection.h
@@ -1,7 +1,7 @@
 #ifndef PQ_CONNECTION_H
 #define PQ_CONNECTION_H
 
-#include "../libdbpp/connection.h"
+#include <connection.h>
 #include <libpq-fe.h>
 
 namespace PQ {
diff --git a/libpqpp/error.h b/libpqpp/error.h
index e8aea56..2acbce3 100644
--- a/libpqpp/error.h
+++ b/libpqpp/error.h
@@ -1,7 +1,7 @@
 #ifndef PQ_ERROR_H
 #define PQ_ERROR_H
 
-#include "../libdbpp/error.h"
+#include <error.h>
 
 namespace PQ {
 	class Error : public DB::Error {
diff --git a/libpqpp/modifycommand.h b/libpqpp/modifycommand.h
index c2e06b6..b451273 100644
--- a/libpqpp/modifycommand.h
+++ b/libpqpp/modifycommand.h
@@ -1,7 +1,7 @@
 #ifndef PQ_MODIFYCOMMAND_H
 #define PQ_MODIFYCOMMAND_H
 
-#include "../libdbpp/modifycommand.h"
+#include <modifycommand.h>
 #include "command.h"
 
 namespace PQ {
diff --git a/libpqpp/selectcommand.h b/libpqpp/selectcommand.h
index 6506e5e..e4acce7 100644
--- a/libpqpp/selectcommand.h
+++ b/libpqpp/selectcommand.h
@@ -1,7 +1,7 @@
 #ifndef PQ_SELECTCOMMAND_H
 #define PQ_SELECTCOMMAND_H
 
-#include "../libdbpp/selectcommand.h"
+#include <selectcommand.h>
 #include "command.h"
 #include <vector>
 #include <map>
diff --git a/libpqpp/unittests/Jamfile.jam b/libpqpp/unittests/Jamfile.jam
index 39d0576..66c4b49 100644
--- a/libpqpp/unittests/Jamfile.jam
+++ b/libpqpp/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
 	testpq.cpp
@@ -10,8 +13,10 @@ run
 	<define>ROOT=\"$(me)\"
 	<define>BOOST_TEST_DYN_LINK
 	<library>..//dbpp-postgresql
-	<library>../../libdbpp//dbpptestcore
+	<library>dbpptestcore
 	<library>boost_utf
+	<library>boost_filesystem
+	<library>boost_system
 	:
 	testpq
 	;
diff --git a/libpqpp/unittests/testpq.cpp b/libpqpp/unittests/testpq.cpp
index 58441d2..3942cfd 100644
--- a/libpqpp/unittests/testpq.cpp
+++ b/libpqpp/unittests/testpq.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 <fstream>
-- 
cgit v1.2.3