boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00
Code Issues Projects Releases Wiki Activity

Handle && inside path features, not only in free features. This allows to

Browse Source 
use "<include>b&&a" to specify two include paths in specific order: specifying
"<include>b <include>a" will sort the paths lexicographically. This is
experimental interface.


[SVN r24691]
This commit is contained in:
Vladimir Prus
2004-08-24 06:16:22 +00:00
parent 53e610976a
commit 1f4eae3a0d
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/build/toolset.jam
View File

@@ -13,6 +13,7 @@ import path ;
import generators ;
import set : difference ;
import regex ;
import sequence ;
.flag-no = 1 ;
@@ -195,25 +196,30 @@ rule set-target-variables ( rule-or-module targets + : properties * )
# and must be actualized
result += [ $(p:G=).actualize ] ;
}
else if path in $(att)
else if path in $(att) || free in $(att)
{
result += [ path.native $(p:G=) ] ;
}
else if free in $(att)
{
local values ;
# Treat features with && in the value
# specially -- each &&-separated element is considered
# separate value. This is needed to handle searched
# libraries, which must be in specific order.
if ! [ MATCH (&&) : $(p:G=) ]
{
result += $(p:G=) ;
values = $(p:G=) ;
}
else
{
result += [ regex.split $(p:G=) "&&" ] ;
values = [ regex.split $(p:G=) "&&" ] ;
}
}
if path in $(att)
{
result += [ sequence.transform path.native : $(values) ] ;
}
else
{
result += $(values) ;
}
}
else
{
result += $(p:G=) ;