diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Jamroot.jam | 40 | ||||
| -rw-r--r-- | libdbpp/Jamfile.jam | 8 | ||||
| -rw-r--r-- | libdbpp/unittests/Jamfile.jam | 4 | ||||
| m--------- | libdbpp/unittests/pq | 0 |
5 files changed, 7 insertions, 48 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..314d94b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libdbpp/unittests/pq"] + path = libdbpp/unittests/pq + url = http://git.randomdan.homeip.net/git/libdbpp-postgresql diff --git a/Jamroot.jam b/Jamroot.jam index 3e015d5..2031151 100644 --- a/Jamroot.jam +++ b/Jamroot.jam @@ -1,9 +1,7 @@ import os ; -import slice ; using gcc : : [ os.environ CXX ] ; -variant component ; variant coverage : debug ; project @@ -14,55 +12,17 @@ project <variant>debug:<linkflags>"-Wl,-z,defs,--warn-once" <variant>coverage:<cxxflags>"-W -Wall -Werror -Wwrite-strings -std=c++1y --coverage -fvisibility=hidden" <variant>coverage:<linkflags>"-Wl,-z,defs,--warn-once --coverage" - <variant>component:<cxxflags>"-W -Wall -Werror -Wwrite-strings -std=c++1y -fPIC -fvisibility=hidden" - <variant>component:<linkflags>"-Wl,-z,lazy,--warn-once,-fPIC" ; -build-project gentoobrowse-api ; -build-project gentoobrowse-client ; -# build-project icetray ; -build-project libadhocutil ; build-project libdbpp ; -build-project libjsonpp ; -build-project libmisc ; -build-project libmysqlpp ; -build-project libodbcpp ; -build-project libpqpp ; -build-project libsqlitepp ; -build-project libtmdb ; -build-project mythfs ; -build-project netfs ; -# build-project p2pvr ; -build-project project2 ; -build-project slicer ; # Some useful aliases -lib xml++-3.0 ; -lib xml2 ; lib glibmm-2.4 ; lib gobject-2.0 ; lib glib-2.0 ; lib sigc-2.0 ; -alias libxmlpp : : : : - <include>/usr/include/libxml++-3.0 - <include>/usr/lib/libxml++-3.0/include - <include>/usr/include/libxml2 - <include>/usr/include/glibmm-2.4 - <include>/usr/lib/glibmm-2.4/include - <include>/usr/include/glib-2.0 - <include>/usr/lib/glib-2.0/include - <include>/usr/include/sigc++-2.0 - <include>/usr/lib/sigc++-2.0/include - <library>xml++-3.0 - <library>xml2 - <library>glibmm-2.4 - <library>gobject-2.0 - <library>glib-2.0 - <library>sigc-2.0 - ; - alias glibmm : : : : <include>/usr/include/glibmm-2.4 <include>/usr/lib/glibmm-2.4/include diff --git a/libdbpp/Jamfile.jam b/libdbpp/Jamfile.jam index 9e7ad28..8152a3a 100644 --- a/libdbpp/Jamfile.jam +++ b/libdbpp/Jamfile.jam @@ -1,10 +1,6 @@ import package ; import lex ; -alias glibmm : : : : - <cflags>"`pkg-config --cflags glibmm-2.4`" - <linkflags>"`pkg-config --libs glibmm-2.4`" - ; lib boost_date_time : : <name>boost_date_time ; lib boost_filesystem ; lib boost_system ; @@ -15,7 +11,7 @@ lib boost_utf : : <name>boost_unit_test_framework ; lib dbppcore : [ glob *.cpp *.ll : test*.cpp createMockDb.cpp ] : - <library>glibmm + <library>..//glibmm <library>adhocutil <library>boost_system <library>boost_thread @@ -23,7 +19,7 @@ lib dbppcore : <include>. : : <include>. - <library>glibmm + <library>..//glibmm <library>boost_date_time <library>boost_system <library>boost_filesystem diff --git a/libdbpp/unittests/Jamfile.jam b/libdbpp/unittests/Jamfile.jam index 5aec066..d27a0a2 100644 --- a/libdbpp/unittests/Jamfile.jam +++ b/libdbpp/unittests/Jamfile.jam @@ -35,7 +35,7 @@ alias libpq : : : : ; lib dbpp-local-postgresql : - [ glob ../../libpqpp/*.cpp ] : + [ glob pq/libpqpp/*.cpp ] : <library>../..//glibmm <library>libpq <library>..//adhocutil @@ -43,7 +43,7 @@ lib dbpp-local-postgresql : <library>boost_date_time <library>boost_system : : - <include>../../libpqpp + <include>pq/libpqpp <cflags>"-I`pg_config --includedir`" <library>../..//glibmm <library>..//dbppcore diff --git a/libdbpp/unittests/pq b/libdbpp/unittests/pq new file mode 160000 +Subproject c8a1a8f06cc9dd3b421db816012af8754d8fbd8 |