summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libmysqlpp/Jamfile.jam18
-rw-r--r--libmysqlpp/column.h2
-rw-r--r--libmysqlpp/command.h2
-rw-r--r--libmysqlpp/connection.h2
-rw-r--r--libmysqlpp/error.h2
-rw-r--r--libmysqlpp/modifycommand.h2
-rw-r--r--libmysqlpp/selectcommand.h2
-rw-r--r--libmysqlpp/unittests/Jamfile.jam7
-rw-r--r--libmysqlpp/unittests/testmysql.cpp6
9 files changed, 28 insertions, 15 deletions
diff --git a/libmysqlpp/Jamfile.jam b/libmysqlpp/Jamfile.jam
index 8d6d2f6..3776f3d 100644
--- a/libmysqlpp/Jamfile.jam
+++ b/libmysqlpp/Jamfile.jam
@@ -1,3 +1,4 @@
+import package ;
alias glibmm : : : :
<cflags>"`pkg-config --cflags glibmm-2.4`"
<linkflags>"`pkg-config --libs glibmm-2.4`"
@@ -5,26 +6,33 @@ alias glibmm : : : :
lib mysql ;
lib adhocutil : : : : <include>/usr/include/adhocutil ;
+lib dbppcore : : : : <include>/usr/include/dbpp ;
+lib boost_date_time ;
+lib boost_system ;
alias libmysql : : : :
<cflags>"`mysql_config --include`"
<linkflags>"`mysql_config --libs`"
;
-
+
lib dbpp-mysql :
[ glob *.cpp ] :
- <library>glibmm
+ <library>glibmm
<library>libmysql
- <library>../libdbpp
+ <library>dbppcore
<library>adhocutil
+ <library>boost_date_time
+ <library>boost_system
<cflags>-fvisibility=hidden
<variant>release:<cflags>-flto
: :
<include>.
<cflags>"-I`mysql_config --include`"
- <library>glibmm
- <library>../libdbpp
+ <library>glibmm
+ <library>dbppcore
;
build-project unittests ;
+package.install install : <install-source-root>. : : dbpp-mysql : [ glob *.h ] ;
+
diff --git a/libmysqlpp/column.h b/libmysqlpp/column.h
index 6146f53..38f4f39 100644
--- a/libmysqlpp/column.h
+++ b/libmysqlpp/column.h
@@ -1,7 +1,7 @@
#ifndef MY_COLUMN_H
#define MY_COLUMN_H
-#include "../libdbpp/column.h"
+#include <column.h>
#include <mysql.h>
namespace MySQL {
diff --git a/libmysqlpp/command.h b/libmysqlpp/command.h
index 72828e0..2de1b85 100644
--- a/libmysqlpp/command.h
+++ b/libmysqlpp/command.h
@@ -1,7 +1,7 @@
#ifndef MY_COMMAND_H
#define MY_COMMAND_H
-#include "../libdbpp/command.h"
+#include <command.h>
#include <mysql.h>
#include <vector>
diff --git a/libmysqlpp/connection.h b/libmysqlpp/connection.h
index 5b6fa79..69377a4 100644
--- a/libmysqlpp/connection.h
+++ b/libmysqlpp/connection.h
@@ -1,7 +1,7 @@
#ifndef MY_CONNECTION_H
#define MY_CONNECTION_H
-#include "../libdbpp/connection.h"
+#include <connection.h>
#include "error.h"
#include <mysql.h>
#include <boost/shared_ptr.hpp>
diff --git a/libmysqlpp/error.h b/libmysqlpp/error.h
index 9ab666b..b4f93b2 100644
--- a/libmysqlpp/error.h
+++ b/libmysqlpp/error.h
@@ -1,7 +1,7 @@
#ifndef MY_ERROR_H
#define MY_ERROR_H
-#include "../libdbpp/error.h"
+#include <error.h>
namespace MySQL {
class Error : public DB::Error {
diff --git a/libmysqlpp/modifycommand.h b/libmysqlpp/modifycommand.h
index 27c4620..abb3507 100644
--- a/libmysqlpp/modifycommand.h
+++ b/libmysqlpp/modifycommand.h
@@ -1,7 +1,7 @@
#ifndef MY_MODIFYCOMMAND_H
#define MY_MODIFYCOMMAND_H
-#include "../libdbpp/modifycommand.h"
+#include <modifycommand.h>
#include "command.h"
namespace MySQL {
diff --git a/libmysqlpp/selectcommand.h b/libmysqlpp/selectcommand.h
index 58c569b..d145ce8 100644
--- a/libmysqlpp/selectcommand.h
+++ b/libmysqlpp/selectcommand.h
@@ -1,7 +1,7 @@
#ifndef MY_SELECTCOMMAND_H
#define MY_SELECTCOMMAND_H
-#include "../libdbpp/selectcommand.h"
+#include <selectcommand.h>
#include "command.h"
namespace MySQL {
diff --git a/libmysqlpp/unittests/Jamfile.jam b/libmysqlpp/unittests/Jamfile.jam
index 3e7b030..ed3e78e 100644
--- a/libmysqlpp/unittests/Jamfile.jam
+++ b/libmysqlpp/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
testmysql.cpp
@@ -10,8 +13,10 @@ run
<define>ROOT=\"$(me)\"
<define>BOOST_TEST_DYN_LINK
<library>..//dbpp-mysql
- <library>../../libdbpp//dbpptestcore
+ <library>dbpptestcore
<library>boost_utf
+ <library>boost_system
+ <library>boost_filesystem
:
testmysql
;
diff --git a/libmysqlpp/unittests/testmysql.cpp b/libmysqlpp/unittests/testmysql.cpp
index 6e915c0..bcbe528 100644
--- a/libmysqlpp/unittests/testmysql.cpp
+++ b/libmysqlpp/unittests/testmysql.cpp
@@ -3,9 +3,9 @@
#include <mock.h>
#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 <testCore.h>
#include <fstream>
#include <boost/date_time/posix_time/posix_time.hpp>