diff options
| author | Beman Dawes <bdawes@acm.org> | 2013-10-27 21:10:04 +0000 |
|---|---|---|
| committer | Beman Dawes <bdawes@acm.org> | 2013-10-27 21:10:04 +0000 |
| commit | 7b6fa2515eb656204d8b5f25e9899b27ef120e77 (patch) | |
| tree | a0052e5f5251752e95b9d815e8898f3c8d403bc5 /tools | |
| parent | 0ad080b6334efa8c6650608c72a8d90a0e9de265 (diff) | |
| download | boost-7b6fa2515eb656204d8b5f25e9899b27ef120e77.tar.gz | |
Merge 86392 from trunk. The spirit change was not applied because the file is not present in branches/release.
[SVN r86489]
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Jamfile.v2 | 3 | ||||
| -rw-r--r-- | tools/regression/build/Jamroot.jam | 25 |
2 files changed, 24 insertions, 4 deletions
diff --git a/tools/Jamfile.v2 b/tools/Jamfile.v2 index d7fab287a8..86cbbefdd1 100644 --- a/tools/Jamfile.v2 +++ b/tools/Jamfile.v2 @@ -12,6 +12,9 @@ project : requirements <link>static + <implicit-dependency>/boost//headers + : + usage-requirements <implicit-dependency>/boost//headers ; use-project /boost/regression : regression/build ; diff --git a/tools/regression/build/Jamroot.jam b/tools/regression/build/Jamroot.jam index e1abe768cd..61eae71210 100644 --- a/tools/regression/build/Jamroot.jam +++ b/tools/regression/build/Jamroot.jam @@ -37,7 +37,7 @@ obj tiny_xml : <define>BOOST_ALL_NO_LIB=1 <define>_CRT_SECURE_NO_WARNINGS - <use>/boost//headers + <implicit-dependency>/boost//headers : release ; @@ -51,7 +51,7 @@ exe process_jam_log : <define>BOOST_ALL_NO_LIB=1 <define>_CRT_SECURE_NO_WARNINGS - <use>/boost//headers + <implicit-dependency>/boost//headers : release ; @@ -64,7 +64,7 @@ exe compiler_status /boost/filesystem//boost_filesystem/<link>static : <define>BOOST_ALL_NO_LIB=1 - <use>/boost//headers + <implicit-dependency>/boost//headers : release ; @@ -77,8 +77,25 @@ exe library_status /boost/filesystem//boost_filesystem/<link>static : <define>BOOST_ALL_NO_LIB=1 - <use>/boost//headers + <implicit-dependency>/boost//headers : release ; explicit library_status ; + +exe boost_report + : + [ glob report/*.cpp ] + /boost/filesystem//boost_filesystem/<link>static + /boost//filesystem/<link>static + /boost//date_time/<link>static + /boost//regex/<link>static + /boost//program_options/<link>static + /boost//iostreams/<link>static + : + <define>BOOST_ALL_NO_LIB=1 + <implicit-dependency>/boost//headers + : + release + ; +explicit boost_report ; |