diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-02-19 21:27:10 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-02-24 18:27:12 +0000 |
| commit | 02e2afb6b16ee1d1d3554f0ea4bfccc4666d4de4 (patch) | |
| tree | 155e8112356969fbd50479be4a6d25c8b990a73e | |
| parent | More clang tidy fixes (diff) | |
| download | slicer-02e2afb6b16ee1d1d3554f0ea4bfccc4666d4de4.tar.bz2 slicer-02e2afb6b16ee1d1d3554f0ea4bfccc4666d4de4.tar.xz slicer-02e2afb6b16ee1d1d3554f0ea4bfccc4666d4de4.zip | |
Single definition of boost_utf
| -rw-r--r-- | slicer/Jamfile.jam | 1 | ||||
| -rw-r--r-- | slicer/db/Jamfile.jam | 9 | ||||
| -rw-r--r-- | slicer/ice/Jamfile.jam | 3 | ||||
| -rw-r--r-- | slicer/json/Jamfile.jam | 3 | ||||
| -rw-r--r-- | slicer/test/Jamfile.jam | 3 | ||||
| -rw-r--r-- | slicer/xml/Jamfile.jam | 3 |
6 files changed, 9 insertions, 13 deletions
diff --git a/slicer/Jamfile.jam b/slicer/Jamfile.jam index e149853..387a313 100644 --- a/slicer/Jamfile.jam +++ b/slicer/Jamfile.jam @@ -8,6 +8,7 @@ build-project db ; build-project ice ; build-project test ; +lib boost_utf : : <name>boost_unit_test_framework ; lib adhocutil : : : : <include>/usr/include/adhocutil ; lib Ice++11 ; lib pthread ; diff --git a/slicer/db/Jamfile.jam b/slicer/db/Jamfile.jam index 7bf1d3d..75c53b8 100644 --- a/slicer/db/Jamfile.jam +++ b/slicer/db/Jamfile.jam @@ -5,7 +5,6 @@ import ../test/slicer.jam ; lib dbppcore : : : : <include>/usr/include/dbpp ; lib dbpp-postgresql : : : : <include>/usr/include/dbpp-postgresql ; lib stdc++fs ; -lib boost_utf : : <name>boost_unit_test_framework ; lib slicer-db : [ glob *.cpp : test*.cpp ] @@ -47,7 +46,7 @@ run testSelect.cpp <implicit-dependency>slicer-db <library>dbpp-postgresql <library>stdc++fs - <library>boost_utf + <library>..//boost_utf <library>../test//types <library>../test//common <library>../slicer//slicer @@ -66,7 +65,7 @@ run testInsert.cpp <library>slicer-db <library>dbpp-postgresql <library>stdc++fs - <library>boost_utf + <library>..//boost_utf <library>../test//types <library>../test//common <library>../slicer//slicer @@ -85,7 +84,7 @@ run testPatch.cpp <library>slicer-db <library>dbpp-postgresql <library>stdc++fs - <library>boost_utf + <library>..//boost_utf <library>../test//types <library>../test//common <library>../slicer//slicer @@ -103,7 +102,7 @@ run testUpdate.cpp <implicit-dependency>slicer-db <library>dbpp-postgresql <library>stdc++fs - <library>boost_utf + <library>..//boost_utf <library>../test//types <library>../test//common <library>../slicer//slicer diff --git a/slicer/ice/Jamfile.jam b/slicer/ice/Jamfile.jam index 32ff6f4..3b9f2b2 100644 --- a/slicer/ice/Jamfile.jam +++ b/slicer/ice/Jamfile.jam @@ -2,7 +2,6 @@ import testing ; import package ; lib stdc++fs ; -lib boost_utf : : <name>boost_unit_test_framework ; lib slicer-ice : [ glob *.cpp : test*.cpp ] @@ -20,7 +19,7 @@ run testSpecifics.cpp : : : <define>BOOST_TEST_DYN_LINK <library>slicer-ice - <library>boost_utf + <library>..//boost_utf <library>../test//types <library>../test//common <library>../slicer//slicer diff --git a/slicer/json/Jamfile.jam b/slicer/json/Jamfile.jam index 0f972a3..7d7a8ed 100644 --- a/slicer/json/Jamfile.jam +++ b/slicer/json/Jamfile.jam @@ -6,7 +6,6 @@ lib jsonpp : : : : ; lib stdc++fs ; -lib boost_utf : : <name>boost_unit_test_framework ; lib slicer-json : [ glob *.cpp : test*.cpp ] @@ -26,7 +25,7 @@ run testSpecifics.cpp <define>BOOST_TEST_DYN_LINK <library>slicer-json <library>stdc++fs - <library>boost_utf + <library>..//boost_utf <library>../test//types <library>../test//common <library>../slicer//slicer diff --git a/slicer/test/Jamfile.jam b/slicer/test/Jamfile.jam index ee6ca66..c5e11d6 100644 --- a/slicer/test/Jamfile.jam +++ b/slicer/test/Jamfile.jam @@ -4,7 +4,6 @@ import ./slicer.jam ; lib dl ; lib stdc++fs ; lib boost_date_time ; -lib boost_utf : : <name>boost_unit_test_framework ; lib types : [ glob *.ice ] @@ -31,7 +30,7 @@ path-constant me : . ; alias common : : : : <library>stdc++fs <define>BOOST_TEST_DYN_LINK - <library>boost_utf + <library>..//boost_utf <implicit-dependency>types <define>ROOT=\"$(me)\" ; diff --git a/slicer/xml/Jamfile.jam b/slicer/xml/Jamfile.jam index 5074e3a..17fe209 100644 --- a/slicer/xml/Jamfile.jam +++ b/slicer/xml/Jamfile.jam @@ -2,7 +2,6 @@ import testing ; import package ; lib stdc++fs ; -lib boost_utf : : <name>boost_unit_test_framework ; lib slicer-xml : [ glob *.cpp : test*.cpp ] @@ -26,7 +25,7 @@ run testSpecifics.cpp <library>slicer-xml <library>stdc++fs <implicit-dependency>slicer-xml - <library>boost_utf + <library>..//boost_utf <library>../test//types <library>../test//common <library>../slicer//slicer |