diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-10-19 15:38:11 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-10-19 15:38:11 +0100 |
| commit | 6df49b45f5e905a4ec9114e7a6cbe484ded798ed (patch) | |
| tree | 0b6af21498edc51f0c36ece09f7b9bf8c54fe130 | |
| parent | Modernize build (diff) | |
| download | libdbpp-sqlite-1.4.2.tar.bz2 libdbpp-sqlite-1.4.2.tar.xz libdbpp-sqlite-1.4.2.zip | |
Refactor to ease testinglibdbpp-sqlite-1.4.2
| -rw-r--r-- | Jamroot.jam | 17 | ||||
| -rw-r--r-- | libsqlitepp/Jamfile.jam | 28 |
2 files changed, 25 insertions, 20 deletions
diff --git a/Jamroot.jam b/Jamroot.jam index 8abf946..3915cab 100644 --- a/Jamroot.jam +++ b/Jamroot.jam @@ -1,25 +1,12 @@ import os ; +import feature : feature ; using gcc : : [ os.environ CXX ] ; using pkg-config ; -import pkg-config ; variant coverage : debug ; -project - : requirements - <cxxstd>17 - <visibility>hidden - <linkflags>"-Wl,-z,defs,--warn-once,--gc-sections" - <variant>release:<cxxflags>"-flto=2" - <variant>release:<linkflags>"-flto=2" - <variant>debug:<warnings>extra - <variant>debug:<warnings-as-errors>on - <variant>coverage:<coverage>on - ; +feature local-dbppcore : no ; build-project libsqlitepp ; -pkg-config.import glibmm : : <name>glibmm-2.4 ; -pkg-config.import sqlite3 : : <name>sqlite3 ; - diff --git a/libsqlitepp/Jamfile.jam b/libsqlitepp/Jamfile.jam index 3dbe005..ca5f886 100644 --- a/libsqlitepp/Jamfile.jam +++ b/libsqlitepp/Jamfile.jam @@ -1,22 +1,40 @@ import package ; +import pkg-config ; lib adhocutil : : : : <include>/usr/include/adhocutil ; lib dbppcore : : : : <include>/usr/include/dbpp ; lib boost_date_time ; lib stdc++fs ; +pkg-config.import glibmm : : <name>glibmm-2.4 ; +pkg-config.import sqlite3 : : <name>sqlite3 ; + +project + : requirements + <cxxstd>17 + <visibility>hidden + <linkflags>"-Wl,-z,defs,--warn-once,--gc-sections" + <variant>release:<cxxflags>"-flto=2" + <variant>release:<linkflags>"-flto=2" + <variant>debug:<warnings>extra + <variant>debug:<warnings-as-errors>on + <variant>coverage:<coverage>on + ; + lib dbpp-sqlite : [ glob *.cpp ] : - <library>..//glibmm - <library>..//sqlite3 + <library>glibmm + <library>sqlite3 <library>adhocutil - <library>dbppcore + <local-dbppcore>yes:<library>../..//dbppcore + <local-dbppcore>no:<library>dbppcore <library>boost_date_time <library>stdc++fs : : <include>. - <library>..//glibmm - <library>dbppcore + <library>glibmm + <local-dbppcore>yes:<library>../..//dbppcore + <local-dbppcore>no:<library>dbppcore ; build-project unittests ; |