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

[SVN r86489]

9 files changed, 54 insertions, 5 deletions

diff --git a/Jamroot b/Jamroot
index d0a23a565f..bbb9bd357f 100644
--- a/Jamroot
+++ b/Jamroot
@@ -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.
diff --git a/libs/geometry b/libs/geometry
-Subproject 6567f7fab9bc59135bd22713cddc7da336b61ed
+Subproject 5c8384f9d5c14e5cdd2bde36aea6d2fe37b464f
diff --git a/libs/numeric/odeint b/libs/numeric/odeint
-Subproject 3057c76d23e29fb69e9d78eccd200dd458f56c7
+Subproject 11274bb78ad8b78ec88172a4f68d945347d9480
diff --git a/libs/parameter b/libs/parameter
-Subproject b74489d477d751dfa784890f045f9aa5a1d0cc5
+Subproject 45295c87bca584085e082bf41b18434de28c638
diff --git a/libs/python b/libs/python
-Subproject ca18dc9daae960a6cdf91a50d1433f386c5945d
+Subproject 832a1edd79905b8b8f3d5b573d4d8072e88fc93
diff --git a/libs/signals2 b/libs/signals2
-Subproject e57ff87af1efc1ff743726806aea803802f3b17
+Subproject 257a3503f013de4e9d0cc78b8165104823e67bc
diff --git a/libs/units b/libs/units
-Subproject f9dbc185c7e389d8b56c0c8925f4fec90349265
+Subproject b6604806b3972e5a1b18e100ac89cb68d1dbbe0
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 ;