organicmaps/boost
13
Fork 0
mirror of https://github.com/boostorg/boost.git synced 2025-04-09 14:57:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge 86392 from trunk. The spirit change was not applied because the file is not present in branches/release.

Browse source 
[SVN r86489]
This commit is contained in:
Beman Dawes 2013-10-27 21:10:04 +00:00
parent 0ad080b633
commit 7b6fa2515e
9 changed files with 60 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Jamroot
View file

@ -128,6 +128,7 @@ import sequence ;
import xsltproc ;
import set ;
import path ;
import link ;
path-constant BOOST_ROOT : . ;
constant BOOST_VERSION : 1.55.0 ;
@ -135,6 +136,34 @@ constant BOOST_JAMROOT_MODULE : $(__name__) ;
boostcpp.set-version $(BOOST_VERSION) ;
local all-headers =
[ MATCH .*libs/(.*)/include/boost : [ glob libs/*/include/boost ] ] ;
for dir in $(all-headers)
{
link-directory $(dir)-headers : libs/$(dir)/include/boost : <location>. ;
explicit $(dir)-headers ;
}
local numeric-headers =
[ MATCH .*libs/numeric/(.*)/include/boost : [ glob libs/*/*/include/boost ] ] ;
for dir in $(numeric-headers)
{
link-directory numeric-$(dir)-headers : libs/numeric/$(dir)/include/boost : <location>. ;
explicit numeric-$(dir)-headers ;
}
if $(all-headers)
{
constant BOOST_MODULARLAYOUT : $(all-headers) $(numeric-headers) ;
}
if $(BOOST_MODULARLAYOUT)
{
echo modularized layout build ;
}
project boost
: requirements <include>.
# Disable auto-linking for all targets here, primarily because it caused
@ -213,7 +242,7 @@ for local l in $(all-libraries)
}
}
alias headers : : : : <include>. ;
alias headers : $(all-headers)-headers numeric-$(numeric-headers)-headers : : : <include>. ;
explicit headers ;
# Make project ids of all libraries known.

2
libs/geometry

@ -1 +1 @@
Subproject commit 6567f7fab9bc59135bd22713cddc7da336b61ed0
Subproject commit 5c8384f9d5c14e5cdd2bde36aea6d2fe37b464fa

2
libs/numeric/odeint

@ -1 +1 @@
Subproject commit 3057c76d23e29fb69e9d78eccd200dd458f56c79
Subproject commit 11274bb78ad8b78ec88172a4f68d945347d94801

2
libs/parameter

@ -1 +1 @@
Subproject commit b74489d477d751dfa784890f045f9aa5a1d0cc52
Subproject commit 45295c87bca584085e082bf41b18434de28c638e

2
libs/python

@ -1 +1 @@
Subproject commit ca18dc9daae960a6cdf91a50d1433f386c5945df
Subproject commit 832a1edd79905b8b8f3d5b573d4d8072e88fc938

2
libs/signals2

@ -1 +1 @@
Subproject commit e57ff87af1efc1ff743726806aea803802f3b171
Subproject commit 257a3503f013de4e9d0cc78b8165104823e67bc3

2
libs/units

@ -1 +1 @@
Subproject commit f9dbc185c7e389d8b56c0c8925f4fec90349265b
Subproject commit b6604806b3972e5a1b18e100ac89cb68d1dbbe01

3
tools/Jamfile.v2
View file

@ -12,6 +12,9 @@ project
:
requirements
<link>static
<implicit-dependency>/boost//headers
:
usage-requirements <implicit-dependency>/boost//headers
;
use-project /boost/regression : regression/build ;

25
tools/regression/build/Jamroot.jam
View file

@ -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 ;