[Boost-commit] svn:boost r80208 - trunk/tools/build/v2/engine

Subject: [Boost-commit] svn:boost r80208 - trunk/tools/build/v2/engine
From: jurko.gospodnetic_at_[hidden]
Date: 2012-08-25 12:09:32

Author: jurko
Date: 2012-08-25 12:09:31 EDT (Sat, 25 Aug 2012)
New Revision: 80208
URL: http://svn.boost.org/trac/boost/changeset/80208

Log:
Updated Boost Jam's internal build system to correctly recognize header changes when using same-named headers located in different folders.
Text files modified: 
   trunk/tools/build/v2/engine/build.jam |    13 ++++++++-----                           
   1 files changed, 8 insertions(+), 5 deletions(-)

Modified: trunk/tools/build/v2/engine/build.jam
==============================================================================
--- trunk/tools/build/v2/engine/build.jam	(original)
+++ trunk/tools/build/v2/engine/build.jam	2012-08-25 12:09:31 EDT (Sat, 25 Aug 2012)
@@ -800,11 +800,14 @@
 rule .hdr.scan ( target : includes * : binding )
 {
     local target-path = [ NORMALIZE_PATH $(binding:D) ] ;
-    NOCARE $(includes) ;
-    INCLUDES $(target) : $(includes) ;
-    SEARCH on $(includes) = $(target-path) ;
-    ISFILE $(includes) ;
-    .scan $(includes) ;
+    # Extra grist provides target name uniqueness when referencing same name
+    # header files from different folders.
+    local include-targets = <$(target-path)>$(includes) ;
+    NOCARE $(include-targets) ;
+    INCLUDES $(target) : $(include-targets) ;
+    SEARCH on $(include-targets) = $(target-path) ;
+    ISFILE $(include-targets) ;
+    .scan $(include-targets) ;
 }
 .scan $(jam.source) ;